refactor: centralize editor defaults

This commit is contained in:
Etienne Lescot
2026-05-18 14:45:33 +02:00
committed by EtienneLescot
parent 9f7f498e22
commit b36a32d44b
10 changed files with 307 additions and 116 deletions
+3 -2
View File
@@ -1,6 +1,7 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { type AspectRatio } from "@/utils/aspectRatioUtils"; import { type AspectRatio } from "@/utils/aspectRatioUtils";
import { DEFAULT_SOURCE_DIMENSIONS } from "./editorDefaults";
interface CropRegion { interface CropRegion {
x: number; // 0-1 normalized x: number; // 0-1 normalized
@@ -32,8 +33,8 @@ export function CropControl({ videoElement, cropRegion, onCropChange }: CropCont
const ctx = canvas.getContext("2d", { alpha: false }); const ctx = canvas.getContext("2d", { alpha: false });
if (!ctx) return; if (!ctx) return;
canvas.width = videoElement.videoWidth || 1920; canvas.width = videoElement.videoWidth || DEFAULT_SOURCE_DIMENSIONS.width;
canvas.height = videoElement.videoHeight || 1080; canvas.height = videoElement.videoHeight || DEFAULT_SOURCE_DIMENSIONS.height;
const draw = () => { const draw = () => {
if (videoElement.readyState >= 2) { if (videoElement.readyState >= 2) {
+26 -19
View File
@@ -53,6 +53,14 @@ import ColorPicker from "../ui/color-picker";
import { AnnotationSettingsPanel } from "./AnnotationSettingsPanel"; import { AnnotationSettingsPanel } from "./AnnotationSettingsPanel";
import { BlurSettingsPanel } from "./BlurSettingsPanel"; import { BlurSettingsPanel } from "./BlurSettingsPanel";
import { CropControl } from "./CropControl"; import { CropControl } from "./CropControl";
import {
DEFAULT_CURSOR_SETTINGS,
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_EXPORT_SETTINGS,
DEFAULT_GIF_SETTINGS,
DEFAULT_SOURCE_DIMENSIONS,
DEFAULT_WEBCAM_SETTINGS,
} from "./editorDefaults";
import { KeyboardShortcutsHelp } from "./KeyboardShortcutsHelp"; import { KeyboardShortcutsHelp } from "./KeyboardShortcutsHelp";
import type { import type {
AnnotationRegion, AnnotationRegion,
@@ -70,7 +78,6 @@ import type {
ZoomFocusMode, ZoomFocusMode,
} from "./types"; } from "./types";
import { import {
DEFAULT_WEBCAM_SIZE_PRESET,
MAX_PLAYBACK_SPEED, MAX_PLAYBACK_SPEED,
MAX_ZOOM_SCALE, MAX_ZOOM_SCALE,
MIN_ZOOM_SCALE, MIN_ZOOM_SCALE,
@@ -382,24 +389,24 @@ export function SettingsPanel({
borderRadius = 0, borderRadius = 0,
onBorderRadiusChange, onBorderRadiusChange,
onBorderRadiusCommit, onBorderRadiusCommit,
padding = 50, padding = DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
onPaddingChange, onPaddingChange,
onPaddingCommit, onPaddingCommit,
cropRegion, cropRegion,
onCropChange, onCropChange,
aspectRatio, aspectRatio,
videoElement, videoElement,
exportQuality = "good", exportQuality = DEFAULT_EXPORT_SETTINGS.quality,
onExportQualityChange, onExportQualityChange,
exportFormat = "mp4", exportFormat = DEFAULT_EXPORT_SETTINGS.format,
onExportFormatChange, onExportFormatChange,
gifFrameRate = 15, gifFrameRate = DEFAULT_GIF_SETTINGS.frameRate,
onGifFrameRateChange, onGifFrameRateChange,
gifLoop = true, gifLoop = DEFAULT_GIF_SETTINGS.loop,
onGifLoopChange, onGifLoopChange,
gifSizePreset = "medium", gifSizePreset = DEFAULT_GIF_SETTINGS.sizePreset,
onGifSizePresetChange, onGifSizePresetChange,
gifOutputDimensions = { width: 1280, height: 720 }, gifOutputDimensions = DEFAULT_GIF_SETTINGS.outputDimensions,
onExport, onExport,
unsavedExport, unsavedExport,
onSaveUnsavedExport, onSaveUnsavedExport,
@@ -421,25 +428,25 @@ export function SettingsPanel({
onSpeedChange, onSpeedChange,
onSpeedDelete, onSpeedDelete,
hasWebcam = false, hasWebcam = false,
webcamLayoutPreset = "picture-in-picture", webcamLayoutPreset = DEFAULT_WEBCAM_SETTINGS.layoutPreset,
onWebcamLayoutPresetChange, onWebcamLayoutPresetChange,
webcamMaskShape = "rectangle", webcamMaskShape = DEFAULT_WEBCAM_SETTINGS.maskShape,
onWebcamMaskShapeChange, onWebcamMaskShapeChange,
webcamSizePreset = DEFAULT_WEBCAM_SIZE_PRESET, webcamSizePreset = DEFAULT_WEBCAM_SETTINGS.sizePreset,
onWebcamSizePresetChange, onWebcamSizePresetChange,
onWebcamSizePresetCommit, onWebcamSizePresetCommit,
onSaveDiagnostic, onSaveDiagnostic,
showCursor = true, showCursor = DEFAULT_CURSOR_SETTINGS.show,
onShowCursorChange, onShowCursorChange,
cursorSize = 3.0, cursorSize = DEFAULT_CURSOR_SETTINGS.size,
onCursorSizeChange, onCursorSizeChange,
cursorSmoothing = 0.67, cursorSmoothing = DEFAULT_CURSOR_SETTINGS.smoothing,
onCursorSmoothingChange, onCursorSmoothingChange,
cursorMotionBlur = 0.35, cursorMotionBlur = DEFAULT_CURSOR_SETTINGS.motionBlur,
onCursorMotionBlurChange, onCursorMotionBlurChange,
cursorClickBounce = 2.5, cursorClickBounce = DEFAULT_CURSOR_SETTINGS.clickBounce,
onCursorClickBounceChange, onCursorClickBounceChange,
cursorClipToBounds = false, cursorClipToBounds = DEFAULT_CURSOR_SETTINGS.clipToBounds,
onCursorClipToBoundsChange, onCursorClipToBoundsChange,
hasCursorData = false, hasCursorData = false,
showCursorSettings = true, showCursorSettings = true,
@@ -478,8 +485,8 @@ export function SettingsPanel({
const [cropAspectRatio, setCropAspectRatio] = useState(""); const [cropAspectRatio, setCropAspectRatio] = useState("");
const isPortraitCanvas = isPortraitAspectRatio(aspectRatio); const isPortraitCanvas = isPortraitAspectRatio(aspectRatio);
const videoWidth = videoElement?.videoWidth || 1920; const videoWidth = videoElement?.videoWidth || DEFAULT_SOURCE_DIMENSIONS.width;
const videoHeight = videoElement?.videoHeight || 1080; const videoHeight = videoElement?.videoHeight || DEFAULT_SOURCE_DIMENSIONS.height;
const handleCropNumericChange = useCallback( const handleCropNumericChange = useCallback(
(field: "x" | "y" | "width" | "height", pixelValue: number) => { (field: "x" | "y" | "width" | "height", pixelValue: number) => {
+45 -30
View File
@@ -49,6 +49,12 @@ import {
isPortraitAspectRatio, isPortraitAspectRatio,
} from "@/utils/aspectRatioUtils"; } from "@/utils/aspectRatioUtils";
import { ExportDialog } from "./ExportDialog"; import { ExportDialog } from "./ExportDialog";
import {
DEFAULT_CURSOR_SETTINGS,
DEFAULT_EXPORT_SETTINGS,
DEFAULT_GIF_SETTINGS,
DEFAULT_SOURCE_DIMENSIONS,
} from "./editorDefaults";
import PlaybackControls from "./PlaybackControls"; import PlaybackControls from "./PlaybackControls";
import { import {
createProjectData, createProjectData,
@@ -71,11 +77,6 @@ import {
DEFAULT_ANNOTATION_SIZE, DEFAULT_ANNOTATION_SIZE,
DEFAULT_ANNOTATION_STYLE, DEFAULT_ANNOTATION_STYLE,
DEFAULT_BLUR_DATA, DEFAULT_BLUR_DATA,
DEFAULT_CURSOR_CLICK_BOUNCE,
DEFAULT_CURSOR_CLIP_TO_BOUNDS,
DEFAULT_CURSOR_MOTION_BLUR,
DEFAULT_CURSOR_SIZE,
DEFAULT_CURSOR_SMOOTHING,
DEFAULT_FIGURE_DATA, DEFAULT_FIGURE_DATA,
DEFAULT_PLAYBACK_SPEED, DEFAULT_PLAYBACK_SPEED,
DEFAULT_ZOOM_DEPTH, DEFAULT_ZOOM_DEPTH,
@@ -203,11 +204,15 @@ export default function VideoEditor() {
const [exportError, setExportError] = useState<string | null>(null); const [exportError, setExportError] = useState<string | null>(null);
const [showExportDialog, setShowExportDialog] = useState(false); const [showExportDialog, setShowExportDialog] = useState(false);
const [showNewRecordingDialog, setShowNewRecordingDialog] = useState(false); const [showNewRecordingDialog, setShowNewRecordingDialog] = useState(false);
const [exportQuality, setExportQuality] = useState<ExportQuality>("good"); const [exportQuality, setExportQuality] = useState<ExportQuality>(
const [exportFormat, setExportFormat] = useState<ExportFormat>("mp4"); DEFAULT_EXPORT_SETTINGS.quality,
const [gifFrameRate, setGifFrameRate] = useState<GifFrameRate>(15); );
const [gifLoop, setGifLoop] = useState(true); const [exportFormat, setExportFormat] = useState<ExportFormat>(DEFAULT_EXPORT_SETTINGS.format);
const [gifSizePreset, setGifSizePreset] = useState<GifSizePreset>("medium"); const [gifFrameRate, setGifFrameRate] = useState<GifFrameRate>(DEFAULT_GIF_SETTINGS.frameRate);
const [gifLoop, setGifLoop] = useState(DEFAULT_GIF_SETTINGS.loop);
const [gifSizePreset, setGifSizePreset] = useState<GifSizePreset>(
DEFAULT_GIF_SETTINGS.sizePreset,
);
const [exportedFilePath, setExportedFilePath] = useState<string | null>(null); const [exportedFilePath, setExportedFilePath] = useState<string | null>(null);
const [lastSavedSnapshot, setLastSavedSnapshot] = useState<string | null>(null); const [lastSavedSnapshot, setLastSavedSnapshot] = useState<string | null>(null);
const [unsavedExport, setUnsavedExport] = useState<{ const [unsavedExport, setUnsavedExport] = useState<{
@@ -238,12 +243,14 @@ export default function VideoEditor() {
}, [cursorRecordingData, cursorTelemetry]); }, [cursorRecordingData, cursorTelemetry]);
// Cursor & motion blur visual settings (non-undoable preferences) // Cursor & motion blur visual settings (non-undoable preferences)
const [showCursor, setShowCursor] = useState(true); const [showCursor, setShowCursor] = useState(DEFAULT_CURSOR_SETTINGS.show);
const [cursorSize, setCursorSize] = useState(DEFAULT_CURSOR_SIZE); const [cursorSize, setCursorSize] = useState(DEFAULT_CURSOR_SETTINGS.size);
const [cursorSmoothing, setCursorSmoothing] = useState(DEFAULT_CURSOR_SMOOTHING); const [cursorSmoothing, setCursorSmoothing] = useState(DEFAULT_CURSOR_SETTINGS.smoothing);
const [cursorMotionBlur, setCursorMotionBlur] = useState(DEFAULT_CURSOR_MOTION_BLUR); const [cursorMotionBlur, setCursorMotionBlur] = useState(DEFAULT_CURSOR_SETTINGS.motionBlur);
const [cursorClickBounce, setCursorClickBounce] = useState(DEFAULT_CURSOR_CLICK_BOUNCE); const [cursorClickBounce, setCursorClickBounce] = useState(DEFAULT_CURSOR_SETTINGS.clickBounce);
const [cursorClipToBounds, setCursorClipToBounds] = useState(DEFAULT_CURSOR_CLIP_TO_BOUNDS); const [cursorClipToBounds, setCursorClipToBounds] = useState(
DEFAULT_CURSOR_SETTINGS.clipToBounds,
);
const [nativePlatform, setNativePlatform] = useState<NativePlatform | null>(null); const [nativePlatform, setNativePlatform] = useState<NativePlatform | null>(null);
const [recordingCursorCaptureMode, setRecordingCursorCaptureMode] = const [recordingCursorCaptureMode, setRecordingCursorCaptureMode] =
useState<CursorCaptureMode | null>(null); useState<CursorCaptureMode | null>(null);
@@ -1575,8 +1582,8 @@ export default function VideoEditor() {
videoPlaybackRef.current?.pause(); videoPlaybackRef.current?.pause();
} }
const sourceWidth = video.videoWidth || 1920; const sourceWidth = video.videoWidth || DEFAULT_SOURCE_DIMENSIONS.width;
const sourceHeight = video.videoHeight || 1080; const sourceHeight = video.videoHeight || DEFAULT_SOURCE_DIMENSIONS.height;
const effectiveSourceDimensions = calculateEffectiveSourceDimensions( const effectiveSourceDimensions = calculateEffectiveSourceDimensions(
sourceWidth, sourceWidth,
sourceHeight, sourceHeight,
@@ -1590,8 +1597,8 @@ export default function VideoEditor() {
// Get preview CONTAINER dimensions for scaling // Get preview CONTAINER dimensions for scaling
const playbackRef = videoPlaybackRef.current; const playbackRef = videoPlaybackRef.current;
const containerElement = playbackRef?.containerRef?.current; const containerElement = playbackRef?.containerRef?.current;
const previewWidth = containerElement?.clientWidth || 1920; const previewWidth = containerElement?.clientWidth || DEFAULT_SOURCE_DIMENSIONS.width;
const previewHeight = containerElement?.clientHeight || 1080; const previewHeight = containerElement?.clientHeight || DEFAULT_SOURCE_DIMENSIONS.height;
if (settings.format === "gif" && settings.gifConfig) { if (settings.format === "gif" && settings.gifConfig) {
// GIF Export // GIF Export
@@ -1845,8 +1852,8 @@ export default function VideoEditor() {
} }
// Build export settings from current state // Build export settings from current state
const sourceWidth = video.videoWidth || 1920; const sourceWidth = video.videoWidth || DEFAULT_SOURCE_DIMENSIONS.width;
const sourceHeight = video.videoHeight || 1080; const sourceHeight = video.videoHeight || DEFAULT_SOURCE_DIMENSIONS.height;
const effectiveSourceDimensions = calculateEffectiveSourceDimensions( const effectiveSourceDimensions = calculateEffectiveSourceDimensions(
sourceWidth, sourceWidth,
sourceHeight, sourceHeight,
@@ -2050,8 +2057,10 @@ export default function VideoEditor() {
aspectRatio: aspectRatio:
aspectRatio === "native" aspectRatio === "native"
? getNativeAspectRatioValue( ? getNativeAspectRatioValue(
videoPlaybackRef.current?.video?.videoWidth || 1920, videoPlaybackRef.current?.video?.videoWidth ||
videoPlaybackRef.current?.video?.videoHeight || 1080, DEFAULT_SOURCE_DIMENSIONS.width,
videoPlaybackRef.current?.video?.videoHeight ||
DEFAULT_SOURCE_DIMENSIONS.height,
cropRegion, cropRegion,
) )
: getAspectRatioValue(aspectRatio), : getAspectRatioValue(aspectRatio),
@@ -2217,21 +2226,27 @@ export default function VideoEditor() {
onGifSizePresetChange={setGifSizePreset} onGifSizePresetChange={setGifSizePreset}
gifOutputDimensions={calculateOutputDimensions( gifOutputDimensions={calculateOutputDimensions(
calculateEffectiveSourceDimensions( calculateEffectiveSourceDimensions(
videoPlaybackRef.current?.video?.videoWidth || 1920, videoPlaybackRef.current?.video?.videoWidth ||
videoPlaybackRef.current?.video?.videoHeight || 1080, DEFAULT_SOURCE_DIMENSIONS.width,
videoPlaybackRef.current?.video?.videoHeight ||
DEFAULT_SOURCE_DIMENSIONS.height,
cropRegion, cropRegion,
).width, ).width,
calculateEffectiveSourceDimensions( calculateEffectiveSourceDimensions(
videoPlaybackRef.current?.video?.videoWidth || 1920, videoPlaybackRef.current?.video?.videoWidth ||
videoPlaybackRef.current?.video?.videoHeight || 1080, DEFAULT_SOURCE_DIMENSIONS.width,
videoPlaybackRef.current?.video?.videoHeight ||
DEFAULT_SOURCE_DIMENSIONS.height,
cropRegion, cropRegion,
).height, ).height,
gifSizePreset, gifSizePreset,
GIF_SIZE_PRESETS, GIF_SIZE_PRESETS,
aspectRatio === "native" aspectRatio === "native"
? getNativeAspectRatioValue( ? getNativeAspectRatioValue(
videoPlaybackRef.current?.video?.videoWidth || 1920, videoPlaybackRef.current?.video?.videoWidth ||
videoPlaybackRef.current?.video?.videoHeight || 1080, DEFAULT_SOURCE_DIMENSIONS.width,
videoPlaybackRef.current?.video?.videoHeight ||
DEFAULT_SOURCE_DIMENSIONS.height,
cropRegion, cropRegion,
) )
: getAspectRatioValue(aspectRatio), : getAspectRatioValue(aspectRatio),
+13 -12
View File
@@ -49,15 +49,16 @@ import {
getNativeAspectRatioValue, getNativeAspectRatioValue,
} from "@/utils/aspectRatioUtils"; } from "@/utils/aspectRatioUtils";
import { AnnotationOverlay } from "./AnnotationOverlay"; import { AnnotationOverlay } from "./AnnotationOverlay";
import {
DEFAULT_CURSOR_SETTINGS,
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_SOURCE_DIMENSIONS,
} from "./editorDefaults";
import { import {
type AnnotationRegion, type AnnotationRegion,
type BlurData, type BlurData,
type CursorTelemetryPoint, type CursorTelemetryPoint,
computeRotation3DContainScale, computeRotation3DContainScale,
DEFAULT_CURSOR_CLICK_BOUNCE,
DEFAULT_CURSOR_MOTION_BLUR,
DEFAULT_CURSOR_SIZE,
DEFAULT_CURSOR_SMOOTHING,
DEFAULT_ROTATION_3D, DEFAULT_ROTATION_3D,
isRotation3DIdentity, isRotation3DIdentity,
lerpRotation3D, lerpRotation3D,
@@ -244,7 +245,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
showBlur, showBlur,
motionBlurAmount = 0, motionBlurAmount = 0,
borderRadius = 0, borderRadius = 0,
padding = 50, padding = DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
cropRegion, cropRegion,
trimRegions = [], trimRegions = [],
speedRegions = [], speedRegions = [],
@@ -265,11 +266,11 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
cursorTelemetry = [], cursorTelemetry = [],
cursorClickTimestamps = [], cursorClickTimestamps = [],
showCursor = false, showCursor = false,
cursorSize = DEFAULT_CURSOR_SIZE, cursorSize = DEFAULT_CURSOR_SETTINGS.size,
cursorSmoothing = DEFAULT_CURSOR_SMOOTHING, cursorSmoothing = DEFAULT_CURSOR_SETTINGS.smoothing,
cursorMotionBlur = DEFAULT_CURSOR_MOTION_BLUR, cursorMotionBlur = DEFAULT_CURSOR_SETTINGS.motionBlur,
cursorClickBounce = DEFAULT_CURSOR_CLICK_BOUNCE, cursorClickBounce = DEFAULT_CURSOR_SETTINGS.clickBounce,
cursorClipToBounds = false, cursorClipToBounds = DEFAULT_CURSOR_SETTINGS.clipToBounds,
}, },
ref, ref,
) => { ) => {
@@ -1824,8 +1825,8 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(
aspectRatio, aspectRatio,
aspectRatio === "native" aspectRatio === "native"
? getNativeAspectRatioValue( ? getNativeAspectRatioValue(
lockedVideoDimensionsRef.current?.width || 1920, lockedVideoDimensionsRef.current?.width || DEFAULT_SOURCE_DIMENSIONS.width,
lockedVideoDimensionsRef.current?.height || 1080, lockedVideoDimensionsRef.current?.height || DEFAULT_SOURCE_DIMENSIONS.height,
cropRegion, cropRegion,
) )
: undefined, : undefined,
@@ -0,0 +1,55 @@
import { describe, expect, it } from "vitest";
import { INITIAL_EDITOR_STATE } from "@/hooks/useEditorHistory";
import { DEFAULT_PREFS } from "@/lib/userPreferences";
import {
DEFAULT_EDITOR_APPEARANCE_SETTINGS,
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_EXPORT_SETTINGS,
DEFAULT_GIF_SETTINGS,
DEFAULT_WEBCAM_SETTINGS,
} from "./editorDefaults";
import { normalizeProjectEditor } from "./projectPersistence";
describe("editor defaults SSOT", () => {
it("keeps history defaults aligned with editor defaults", () => {
expect(INITIAL_EDITOR_STATE).toMatchObject({
...DEFAULT_EDITOR_APPEARANCE_SETTINGS,
padding: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
aspectRatio: DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio,
cropRegion: DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion,
wallpaper: DEFAULT_EDITOR_LAYOUT_SETTINGS.wallpaper,
webcamLayoutPreset: DEFAULT_WEBCAM_SETTINGS.layoutPreset,
webcamMaskShape: DEFAULT_WEBCAM_SETTINGS.maskShape,
webcamSizePreset: DEFAULT_WEBCAM_SETTINGS.sizePreset,
webcamPosition: DEFAULT_WEBCAM_SETTINGS.position,
});
});
it("keeps user preference defaults aligned with editor and export defaults", () => {
expect(DEFAULT_PREFS).toMatchObject({
padding: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
aspectRatio: DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio,
exportQuality: DEFAULT_EXPORT_SETTINGS.quality,
exportFormat: DEFAULT_EXPORT_SETTINGS.format,
});
});
it("keeps project fallback normalization aligned with editor defaults", () => {
expect(normalizeProjectEditor({})).toMatchObject({
...DEFAULT_EDITOR_APPEARANCE_SETTINGS,
padding: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
cropRegion: DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion,
wallpaper: DEFAULT_EDITOR_LAYOUT_SETTINGS.wallpaper,
aspectRatio: DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio,
webcamLayoutPreset: DEFAULT_WEBCAM_SETTINGS.layoutPreset,
webcamMaskShape: DEFAULT_WEBCAM_SETTINGS.maskShape,
webcamSizePreset: DEFAULT_WEBCAM_SETTINGS.sizePreset,
webcamPosition: DEFAULT_WEBCAM_SETTINGS.position,
exportQuality: DEFAULT_EXPORT_SETTINGS.quality,
exportFormat: DEFAULT_EXPORT_SETTINGS.format,
gifFrameRate: DEFAULT_GIF_SETTINGS.frameRate,
gifLoop: DEFAULT_GIF_SETTINGS.loop,
gifSizePreset: DEFAULT_GIF_SETTINGS.sizePreset,
});
});
});
@@ -0,0 +1,95 @@
import type { ExportFormat, ExportQuality, GifFrameRate, GifSizePreset } from "@/lib/exporter";
import { DEFAULT_WALLPAPER } from "@/lib/wallpaper";
import type { AspectRatio } from "@/utils/aspectRatioUtils";
import {
type CursorVisualSettings,
DEFAULT_CROP_REGION,
DEFAULT_CURSOR_CLICK_BOUNCE,
DEFAULT_CURSOR_CLIP_TO_BOUNDS,
DEFAULT_CURSOR_MOTION_BLUR,
DEFAULT_CURSOR_SIZE,
DEFAULT_CURSOR_SMOOTHING,
DEFAULT_WEBCAM_LAYOUT_PRESET,
DEFAULT_WEBCAM_MASK_SHAPE,
DEFAULT_WEBCAM_POSITION,
DEFAULT_WEBCAM_SIZE_PRESET,
type WebcamLayoutPreset,
type WebcamMaskShape,
type WebcamPosition,
type WebcamSizePreset,
} from "./types";
export const DEFAULT_SOURCE_DIMENSIONS = {
width: 1920,
height: 1080,
} as const;
export const DEFAULT_GIF_OUTPUT_DIMENSIONS = {
width: 1280,
height: 720,
} as const;
export const DEFAULT_EDITOR_APPEARANCE_SETTINGS: {
shadowIntensity: number;
showBlur: boolean;
motionBlurAmount: number;
borderRadius: number;
} = {
shadowIntensity: 0,
showBlur: false,
motionBlurAmount: 0,
borderRadius: 0,
};
export const DEFAULT_EDITOR_LAYOUT_SETTINGS: {
padding: number;
aspectRatio: AspectRatio;
cropRegion: typeof DEFAULT_CROP_REGION;
wallpaper: string;
} = {
padding: 50,
aspectRatio: "16:9",
cropRegion: DEFAULT_CROP_REGION,
wallpaper: DEFAULT_WALLPAPER,
};
export const DEFAULT_WEBCAM_SETTINGS = {
layoutPreset: DEFAULT_WEBCAM_LAYOUT_PRESET,
maskShape: DEFAULT_WEBCAM_MASK_SHAPE,
sizePreset: DEFAULT_WEBCAM_SIZE_PRESET,
position: DEFAULT_WEBCAM_POSITION,
} as const satisfies {
layoutPreset: WebcamLayoutPreset;
maskShape: WebcamMaskShape;
sizePreset: WebcamSizePreset;
position: WebcamPosition | null;
};
export const DEFAULT_CURSOR_SETTINGS: CursorVisualSettings & { show: boolean } = {
show: true,
size: DEFAULT_CURSOR_SIZE,
smoothing: DEFAULT_CURSOR_SMOOTHING,
motionBlur: DEFAULT_CURSOR_MOTION_BLUR,
clickBounce: DEFAULT_CURSOR_CLICK_BOUNCE,
clipToBounds: DEFAULT_CURSOR_CLIP_TO_BOUNDS,
};
export const DEFAULT_EXPORT_SETTINGS: {
quality: ExportQuality;
format: ExportFormat;
} = {
quality: "good",
format: "mp4",
};
export const DEFAULT_GIF_SETTINGS: {
frameRate: GifFrameRate;
loop: boolean;
sizePreset: GifSizePreset;
outputDimensions: typeof DEFAULT_GIF_OUTPUT_DIMENSIONS;
} = {
frameRate: 15,
loop: true,
sizePreset: "medium",
outputDimensions: DEFAULT_GIF_OUTPUT_DIMENSIONS,
};
@@ -4,6 +4,13 @@ import type { ProjectMedia } from "@/lib/recordingSession";
import { normalizeProjectMedia } from "@/lib/recordingSession"; import { normalizeProjectMedia } from "@/lib/recordingSession";
import { DEFAULT_WALLPAPER, WALLPAPER_PATHS } from "@/lib/wallpaper"; import { DEFAULT_WALLPAPER, WALLPAPER_PATHS } from "@/lib/wallpaper";
import { ASPECT_RATIOS, type AspectRatio, isPortraitAspectRatio } from "@/utils/aspectRatioUtils"; import { ASPECT_RATIOS, type AspectRatio, isPortraitAspectRatio } from "@/utils/aspectRatioUtils";
import {
DEFAULT_EDITOR_APPEARANCE_SETTINGS,
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_EXPORT_SETTINGS,
DEFAULT_GIF_SETTINGS,
DEFAULT_WEBCAM_SETTINGS,
} from "./editorDefaults";
import { import {
type AnnotationRegion, type AnnotationRegion,
type CropRegion, type CropRegion,
@@ -15,14 +22,10 @@ import {
DEFAULT_BLUR_DATA, DEFAULT_BLUR_DATA,
DEFAULT_BLUR_FREEHAND_POINTS, DEFAULT_BLUR_FREEHAND_POINTS,
DEFAULT_BLUR_INTENSITY, DEFAULT_BLUR_INTENSITY,
DEFAULT_CROP_REGION,
DEFAULT_FIGURE_DATA, DEFAULT_FIGURE_DATA,
DEFAULT_PLAYBACK_SPEED, DEFAULT_PLAYBACK_SPEED,
DEFAULT_WEBCAM_LAYOUT_PRESET,
DEFAULT_WEBCAM_MASK_SHAPE,
DEFAULT_WEBCAM_POSITION,
DEFAULT_WEBCAM_SIZE_PRESET,
DEFAULT_ZOOM_DEPTH, DEFAULT_ZOOM_DEPTH,
DEFAULT_ZOOM_MOTION_BLUR,
MAX_BLUR_BLOCK_SIZE, MAX_BLUR_BLOCK_SIZE,
MAX_BLUR_INTENSITY, MAX_BLUR_INTENSITY,
MAX_PLAYBACK_SPEED, MAX_PLAYBACK_SPEED,
@@ -104,13 +107,13 @@ function computeNormalizedWebcamLayoutPreset(
case "vertical-stack": case "vertical-stack":
return isPortraitAspectRatio(normalizedAspectRatio) return isPortraitAspectRatio(normalizedAspectRatio)
? webcamLayoutPreset ? webcamLayoutPreset
: DEFAULT_WEBCAM_LAYOUT_PRESET; : DEFAULT_WEBCAM_SETTINGS.layoutPreset;
case "dual-frame": case "dual-frame":
return isPortraitAspectRatio(normalizedAspectRatio) return isPortraitAspectRatio(normalizedAspectRatio)
? DEFAULT_WEBCAM_LAYOUT_PRESET ? DEFAULT_WEBCAM_SETTINGS.layoutPreset
: webcamLayoutPreset; : webcamLayoutPreset;
default: default:
return DEFAULT_WEBCAM_LAYOUT_PRESET; return DEFAULT_WEBCAM_SETTINGS.layoutPreset;
} }
} }
@@ -211,7 +214,7 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
editor.aspectRatio as AspectRatio, editor.aspectRatio as AspectRatio,
) )
? (editor.aspectRatio as AspectRatio) ? (editor.aspectRatio as AspectRatio)
: "16:9"; : DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio;
const normalizedWebcamLayoutPreset = computeNormalizedWebcamLayoutPreset( const normalizedWebcamLayoutPreset = computeNormalizedWebcamLayoutPreset(
editor.webcamLayoutPreset, editor.webcamLayoutPreset,
normalizedAspectRatio, normalizedAspectRatio,
@@ -226,7 +229,7 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
cx: clamp((editor.webcamPosition as WebcamPosition).cx, 0, 1), cx: clamp((editor.webcamPosition as WebcamPosition).cx, 0, 1),
cy: clamp((editor.webcamPosition as WebcamPosition).cy, 0, 1), cy: clamp((editor.webcamPosition as WebcamPosition).cy, 0, 1),
} }
: DEFAULT_WEBCAM_POSITION; : DEFAULT_WEBCAM_SETTINGS.position;
const normalizedZoomRegions: ZoomRegion[] = Array.isArray(editor.zoomRegions) const normalizedZoomRegions: ZoomRegion[] = Array.isArray(editor.zoomRegions)
? editor.zoomRegions ? editor.zoomRegions
@@ -413,16 +416,16 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
const rawCropX = isFiniteNumber(editor.cropRegion?.x) const rawCropX = isFiniteNumber(editor.cropRegion?.x)
? editor.cropRegion.x ? editor.cropRegion.x
: DEFAULT_CROP_REGION.x; : DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion.x;
const rawCropY = isFiniteNumber(editor.cropRegion?.y) const rawCropY = isFiniteNumber(editor.cropRegion?.y)
? editor.cropRegion.y ? editor.cropRegion.y
: DEFAULT_CROP_REGION.y; : DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion.y;
const rawCropWidth = isFiniteNumber(editor.cropRegion?.width) const rawCropWidth = isFiniteNumber(editor.cropRegion?.width)
? editor.cropRegion.width ? editor.cropRegion.width
: DEFAULT_CROP_REGION.width; : DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion.width;
const rawCropHeight = isFiniteNumber(editor.cropRegion?.height) const rawCropHeight = isFiniteNumber(editor.cropRegion?.height)
? editor.cropRegion.height ? editor.cropRegion.height
: DEFAULT_CROP_REGION.height; : DEFAULT_EDITOR_LAYOUT_SETTINGS.cropRegion.height;
const cropX = clamp(rawCropX, 0, 1); const cropX = clamp(rawCropX, 0, 1);
const cropY = clamp(rawCropY, 0, 1); const cropY = clamp(rawCropY, 0, 1);
@@ -433,18 +436,29 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
wallpaper: wallpaper:
typeof editor.wallpaper === "string" typeof editor.wallpaper === "string"
? normalizeWallpaperValue(editor.wallpaper) ? normalizeWallpaperValue(editor.wallpaper)
: DEFAULT_WALLPAPER, : DEFAULT_EDITOR_LAYOUT_SETTINGS.wallpaper,
shadowIntensity: typeof editor.shadowIntensity === "number" ? editor.shadowIntensity : 0, shadowIntensity:
showBlur: typeof editor.showBlur === "boolean" ? editor.showBlur : false, typeof editor.shadowIntensity === "number"
? editor.shadowIntensity
: DEFAULT_EDITOR_APPEARANCE_SETTINGS.shadowIntensity,
showBlur:
typeof editor.showBlur === "boolean"
? editor.showBlur
: DEFAULT_EDITOR_APPEARANCE_SETTINGS.showBlur,
motionBlurAmount: isFiniteNumber(editor.motionBlurAmount) motionBlurAmount: isFiniteNumber(editor.motionBlurAmount)
? clamp(editor.motionBlurAmount, 0, 1) ? clamp(editor.motionBlurAmount, 0, 1)
: typeof (editor as { motionBlurEnabled?: unknown }).motionBlurEnabled === "boolean" : typeof (editor as { motionBlurEnabled?: unknown }).motionBlurEnabled === "boolean"
? (editor as { motionBlurEnabled?: boolean }).motionBlurEnabled ? (editor as { motionBlurEnabled?: boolean }).motionBlurEnabled
? 0.35 ? DEFAULT_ZOOM_MOTION_BLUR
: 0 : DEFAULT_EDITOR_APPEARANCE_SETTINGS.motionBlurAmount
: 0, : DEFAULT_EDITOR_APPEARANCE_SETTINGS.motionBlurAmount,
borderRadius: typeof editor.borderRadius === "number" ? editor.borderRadius : 0, borderRadius:
padding: isFiniteNumber(editor.padding) ? clamp(editor.padding, 0, 100) : 50, typeof editor.borderRadius === "number"
? editor.borderRadius
: DEFAULT_EDITOR_APPEARANCE_SETTINGS.borderRadius,
padding: isFiniteNumber(editor.padding)
? clamp(editor.padding, 0, 100)
: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
cropRegion: { cropRegion: {
x: cropX, x: cropX,
y: cropY, y: cropY,
@@ -463,31 +477,31 @@ export function normalizeProjectEditor(editor: Partial<ProjectEditorState>): Pro
editor.webcamMaskShape === "square" || editor.webcamMaskShape === "square" ||
editor.webcamMaskShape === "rounded" editor.webcamMaskShape === "rounded"
? editor.webcamMaskShape ? editor.webcamMaskShape
: DEFAULT_WEBCAM_MASK_SHAPE, : DEFAULT_WEBCAM_SETTINGS.maskShape,
webcamSizePreset: webcamSizePreset:
typeof editor.webcamSizePreset === "number" && isFiniteNumber(editor.webcamSizePreset) typeof editor.webcamSizePreset === "number" && isFiniteNumber(editor.webcamSizePreset)
? Math.max(10, Math.min(50, editor.webcamSizePreset)) ? Math.max(10, Math.min(50, editor.webcamSizePreset))
: DEFAULT_WEBCAM_SIZE_PRESET, : DEFAULT_WEBCAM_SETTINGS.sizePreset,
webcamPosition: normalizedWebcamPosition, webcamPosition: normalizedWebcamPosition,
exportQuality: exportQuality:
editor.exportQuality === "medium" || editor.exportQuality === "source" editor.exportQuality === "medium" || editor.exportQuality === "source"
? editor.exportQuality ? editor.exportQuality
: "good", : DEFAULT_EXPORT_SETTINGS.quality,
exportFormat: editor.exportFormat === "gif" ? "gif" : "mp4", exportFormat: editor.exportFormat === "gif" ? "gif" : DEFAULT_EXPORT_SETTINGS.format,
gifFrameRate: gifFrameRate:
editor.gifFrameRate === 15 || editor.gifFrameRate === 15 ||
editor.gifFrameRate === 20 || editor.gifFrameRate === 20 ||
editor.gifFrameRate === 25 || editor.gifFrameRate === 25 ||
editor.gifFrameRate === 30 editor.gifFrameRate === 30
? editor.gifFrameRate ? editor.gifFrameRate
: 15, : DEFAULT_GIF_SETTINGS.frameRate,
gifLoop: typeof editor.gifLoop === "boolean" ? editor.gifLoop : true, gifLoop: typeof editor.gifLoop === "boolean" ? editor.gifLoop : DEFAULT_GIF_SETTINGS.loop,
gifSizePreset: gifSizePreset:
editor.gifSizePreset === "medium" || editor.gifSizePreset === "medium" ||
editor.gifSizePreset === "large" || editor.gifSizePreset === "large" ||
editor.gifSizePreset === "original" editor.gifSizePreset === "original"
? editor.gifSizePreset ? editor.gifSizePreset
: "medium", : DEFAULT_GIF_SETTINGS.sizePreset,
}; };
} }
+1
View File
@@ -188,6 +188,7 @@ export interface CursorVisualSettings {
smoothing: number; smoothing: number;
motionBlur: number; motionBlur: number;
clickBounce: number; clickBounce: number;
clipToBounds: boolean;
} }
export const DEFAULT_CURSOR_SIZE = 3.0; export const DEFAULT_CURSOR_SIZE = 3.0;
+17 -19
View File
@@ -1,4 +1,9 @@
import { useCallback, useRef, useState } from "react"; import { useCallback, useRef, useState } from "react";
import {
DEFAULT_EDITOR_APPEARANCE_SETTINGS,
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_WEBCAM_SETTINGS,
} from "@/components/video-editor/editorDefaults";
import type { import type {
AnnotationRegion, AnnotationRegion,
CropRegion, CropRegion,
@@ -10,14 +15,7 @@ import type {
WebcamSizePreset, WebcamSizePreset,
ZoomRegion, ZoomRegion,
} from "@/components/video-editor/types"; } from "@/components/video-editor/types";
import { import { DEFAULT_CROP_REGION } from "@/components/video-editor/types";
DEFAULT_CROP_REGION,
DEFAULT_WEBCAM_LAYOUT_PRESET,
DEFAULT_WEBCAM_MASK_SHAPE,
DEFAULT_WEBCAM_POSITION,
DEFAULT_WEBCAM_SIZE_PRESET,
} from "@/components/video-editor/types";
import { DEFAULT_WALLPAPER } from "@/lib/wallpaper";
import type { AspectRatio } from "@/utils/aspectRatioUtils"; import type { AspectRatio } from "@/utils/aspectRatioUtils";
// Undoable state — selection IDs are intentionally excluded (undoing a // Undoable state — selection IDs are intentionally excluded (undoing a
@@ -47,17 +45,17 @@ export const INITIAL_EDITOR_STATE: EditorState = {
speedRegions: [], speedRegions: [],
annotationRegions: [], annotationRegions: [],
cropRegion: DEFAULT_CROP_REGION, cropRegion: DEFAULT_CROP_REGION,
wallpaper: DEFAULT_WALLPAPER, wallpaper: DEFAULT_EDITOR_LAYOUT_SETTINGS.wallpaper,
shadowIntensity: 0, shadowIntensity: DEFAULT_EDITOR_APPEARANCE_SETTINGS.shadowIntensity,
showBlur: false, showBlur: DEFAULT_EDITOR_APPEARANCE_SETTINGS.showBlur,
motionBlurAmount: 0, motionBlurAmount: DEFAULT_EDITOR_APPEARANCE_SETTINGS.motionBlurAmount,
borderRadius: 0, borderRadius: DEFAULT_EDITOR_APPEARANCE_SETTINGS.borderRadius,
padding: 50, padding: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
aspectRatio: "16:9", aspectRatio: DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio,
webcamLayoutPreset: DEFAULT_WEBCAM_LAYOUT_PRESET, webcamLayoutPreset: DEFAULT_WEBCAM_SETTINGS.layoutPreset,
webcamMaskShape: DEFAULT_WEBCAM_MASK_SHAPE, webcamMaskShape: DEFAULT_WEBCAM_SETTINGS.maskShape,
webcamSizePreset: DEFAULT_WEBCAM_SIZE_PRESET, webcamSizePreset: DEFAULT_WEBCAM_SETTINGS.sizePreset,
webcamPosition: DEFAULT_WEBCAM_POSITION, webcamPosition: DEFAULT_WEBCAM_SETTINGS.position,
}; };
type StateUpdate = Partial<EditorState> | ((prev: EditorState) => Partial<EditorState>); type StateUpdate = Partial<EditorState> | ((prev: EditorState) => Partial<EditorState>);
+9 -5
View File
@@ -1,3 +1,7 @@
import {
DEFAULT_EDITOR_LAYOUT_SETTINGS,
DEFAULT_EXPORT_SETTINGS,
} from "@/components/video-editor/editorDefaults";
import type { ExportFormat, ExportQuality } from "@/lib/exporter"; import type { ExportFormat, ExportQuality } from "@/lib/exporter";
import type { AspectRatio } from "@/utils/aspectRatioUtils"; import type { AspectRatio } from "@/utils/aspectRatioUtils";
@@ -27,11 +31,11 @@ export interface UserPreferences {
exportFolder: string | null; exportFolder: string | null;
} }
const DEFAULT_PREFS: UserPreferences = { export const DEFAULT_PREFS: UserPreferences = {
padding: 50, padding: DEFAULT_EDITOR_LAYOUT_SETTINGS.padding,
aspectRatio: "16:9", aspectRatio: DEFAULT_EDITOR_LAYOUT_SETTINGS.aspectRatio,
exportQuality: "good", exportQuality: DEFAULT_EXPORT_SETTINGS.quality,
exportFormat: "mp4", exportFormat: DEFAULT_EXPORT_SETTINGS.format,
exportFolder: null, exportFolder: null,
}; };