From b682407a33d4a3a5ab1a95ffa901396a23377e60 Mon Sep 17 00:00:00 2001 From: ct Date: Sat, 28 Jun 2025 13:27:10 +0800 Subject: [PATCH] Update --- .../editor/partials/canvas/video-editor.jsx | 1 + .../editor/partials/canvas/video-export.jsx | 19 ++++++++++--------- vite.config.ts | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/resources/js/modules/editor/partials/canvas/video-editor.jsx b/resources/js/modules/editor/partials/canvas/video-editor.jsx index 299e7b3..b2e16c9 100644 --- a/resources/js/modules/editor/partials/canvas/video-editor.jsx +++ b/resources/js/modules/editor/partials/canvas/video-editor.jsx @@ -217,6 +217,7 @@ const VideoEditor = ({ width, height, onOpenTextSidebar }) => { timelineElements, dimensions, totalDuration, + watermarked, }); const setupVideos = () => { diff --git a/resources/js/modules/editor/partials/canvas/video-export.jsx b/resources/js/modules/editor/partials/canvas/video-export.jsx index 54e0b32..bc54f69 100644 --- a/resources/js/modules/editor/partials/canvas/video-export.jsx +++ b/resources/js/modules/editor/partials/canvas/video-export.jsx @@ -6,7 +6,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; // Import centralized font management import { getFontStyle, loadTimelineFonts, WATERMARK_CONFIG } from '@/modules/editor/fonts'; -const useVideoExport = ({ timelineElements, dimensions, totalDuration }) => { +const useVideoExport = ({ timelineElements, dimensions, totalDuration, watermarked = false }) => { const [showConsoleLogs] = useState(true); const [isExporting, setIsExporting] = useState(false); @@ -597,15 +597,16 @@ const useVideoExport = ({ timelineElements, dimensions, totalDuration }) => { setExportProgress(15 + Math.round((i / texts.length) * 15)); } - // Render watermark if needed (you'll need to pass watermarked prop) + // Render watermark if needed let watermarkFileName = null; - // Uncomment if you have watermarked prop available: - // if (watermarked) { - // const watermarkDataURL = await renderWatermarkToImage(dimensions); - // const watermarkImageData = await fetchFile(watermarkDataURL); - // watermarkFileName = 'watermark.png'; - // await ffmpeg.writeFile(watermarkFileName, watermarkImageData); - // } + if (watermarked) { + showConsoleLogs && console.log('🏷️ Rendering watermark for export'); + const watermarkDataURL = await renderWatermarkToImage(dimensions); + const watermarkImageData = await fetchFile(watermarkDataURL); + watermarkFileName = 'watermark.png'; + await ffmpeg.writeFile(watermarkFileName, watermarkImageData); + showConsoleLogs && console.log('✅ Watermark saved to FFmpeg filesystem'); + } setExportProgress(30); showConsoleLogs && console.log('✅ All text elements rendered to images'); diff --git a/vite.config.ts b/vite.config.ts index 710878b..34ab181 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -16,6 +16,7 @@ export default defineConfig({ ], esbuild: { jsx: 'automatic', + drop: ["console", "debugger"], }, resolve: { alias: {