Create polished demo videos without editing skills. Mac/Windows/Linux
annotations in preview
Siddharthcbc77475c280
diff --git a/package-lock.json b/package-lock.jsonindex 1a9f7663..8b11eb49 100644--- a/package-lock.json+++ b/package-lock.json@@ -12,23 +12,31 @@"@pixi/filter-drop-shadow": "^5.2.0","@radix-ui/react-dialog": "^1.1.15","@radix-ui/react-dropdown-menu": "^2.1.16",+ "@radix-ui/react-popover": "^1.1.15",+ "@radix-ui/react-select": "^2.2.6","@radix-ui/react-slider": "^1.3.6","@radix-ui/react-slot": "^1.2.3","@radix-ui/react-switch": "^1.2.6","@radix-ui/react-tabs": "^1.1.13",+ "@radix-ui/react-toggle": "^1.1.10",+ "@radix-ui/react-toggle-group": "^1.1.11","@uiw/color-convert": "^2.9.2","@uiw/react-color-colorful": "^2.9.0","class-variance-authority": "^0.7.1","clsx": "^2.1.1","dnd-timeline": "^2.2.0",+ "emoji-picker-react": "^4.16.1",+ "gsap": "^3.13.0","lucide-react": "^0.545.0","mediabunny": "^1.25.1",+ "motion": "^12.23.24","mp4box": "^2.2.0","pixi.js": "^8.14.0","react": "^18.2.0","react-dom": "^18.2.0","react-icons": "^5.5.0","react-resizable-panels": "^3.0.6",+ "react-rnd": "^10.5.2","sonner": "^2.0.7","tailwind-merge": "^3.3.1","tailwindcss-animate": "^1.0.7",@@ -2579,6 +2587,43 @@}}},+ "node_modules/@radix-ui/react-popover": {+ "version": "1.1.15",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz",+ "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/primitive": "1.1.3",+ "@radix-ui/react-compose-refs": "1.1.2",+ "@radix-ui/react-context": "1.1.2",+ "@radix-ui/react-dismissable-layer": "1.1.11",+ "@radix-ui/react-focus-guards": "1.1.3",+ "@radix-ui/react-focus-scope": "1.1.7",+ "@radix-ui/react-id": "1.1.1",+ "@radix-ui/react-popper": "1.2.8",+ "@radix-ui/react-portal": "1.1.9",+ "@radix-ui/react-presence": "1.1.5",+ "@radix-ui/react-primitive": "2.1.3",+ "@radix-ui/react-slot": "1.2.3",+ "@radix-ui/react-use-controllable-state": "1.2.2",+ "aria-hidden": "^1.2.4",+ "react-remove-scroll": "^2.6.3"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-popper": {"version": "1.2.8","resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz",@@ -2713,6 +2758,49 @@}}},+ "node_modules/@radix-ui/react-select": {+ "version": "2.2.6",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",+ "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/number": "1.1.1",+ "@radix-ui/primitive": "1.1.3",+ "@radix-ui/react-collection": "1.1.7",+ "@radix-ui/react-compose-refs": "1.1.2",+ "@radix-ui/react-context": "1.1.2",+ "@radix-ui/react-direction": "1.1.1",+ "@radix-ui/react-dismissable-layer": "1.1.11",+ "@radix-ui/react-focus-guards": "1.1.3",+ "@radix-ui/react-focus-scope": "1.1.7",+ "@radix-ui/react-id": "1.1.1",+ "@radix-ui/react-popper": "1.2.8",+ "@radix-ui/react-portal": "1.1.9",+ "@radix-ui/react-primitive": "2.1.3",+ "@radix-ui/react-slot": "1.2.3",+ "@radix-ui/react-use-callback-ref": "1.1.1",+ "@radix-ui/react-use-controllable-state": "1.2.2",+ "@radix-ui/react-use-layout-effect": "1.1.1",+ "@radix-ui/react-use-previous": "1.1.1",+ "@radix-ui/react-visually-hidden": "1.2.3",+ "aria-hidden": "^1.2.4",+ "react-remove-scroll": "^2.6.3"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-slider": {"version": "1.3.6","resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.3.6.tgz",@@ -2823,6 +2911,60 @@}}},+ "node_modules/@radix-ui/react-toggle": {+ "version": "1.1.10",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz",+ "integrity": "sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/primitive": "1.1.3",+ "@radix-ui/react-primitive": "2.1.3",+ "@radix-ui/react-use-controllable-state": "1.2.2"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/@radix-ui/react-toggle-group": {+ "version": "1.1.11",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.11.tgz",+ "integrity": "sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/primitive": "1.1.3",+ "@radix-ui/react-context": "1.1.2",+ "@radix-ui/react-direction": "1.1.1",+ "@radix-ui/react-primitive": "2.1.3",+ "@radix-ui/react-roving-focus": "1.1.11",+ "@radix-ui/react-toggle": "1.1.10",+ "@radix-ui/react-use-controllable-state": "1.2.2"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-use-callback-ref": {"version": "1.1.1","resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",@@ -2959,6 +3101,29 @@}}},+ "node_modules/@radix-ui/react-visually-hidden": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",+ "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/react-primitive": "2.1.3"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/rect": {"version": "1.1.1","resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",@@ -6291,6 +6456,21 @@"dev": true,"license": "ISC"},+ "node_modules/emoji-picker-react": {+ "version": "4.16.1",+ "resolved": "https://registry.npmjs.org/emoji-picker-react/-/emoji-picker-react-4.16.1.tgz",+ "integrity": "sha512-MrPX0tOCfRL3uYI4of/2GRZ7S6qS7YlacKiF78uFH84/C62vcuHE2DZyv5b4ZJMk0e06es1jjB4e31Bb+YSM8w==",+ "license": "MIT",+ "dependencies": {+ "flairup": "1.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "peerDependencies": {+ "react": ">=16"+ }+ },"node_modules/emoji-regex": {"version": "8.0.0","resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",@@ -6905,6 +7085,12 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/flairup": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/flairup/-/flairup-1.0.0.tgz",+ "integrity": "sha512-IKlE+pNvL2R+kVL1kEhUYqRxVqeFnjiIvHWDMLFXNaqyUdFXQM2wte44EfMYJNHkW16X991t2Zg8apKkhv7OBA==",+ "license": "MIT"+ },"node_modules/flat-cache": {"version": "3.2.0","resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",@@ -7005,6 +7191,33 @@"url": "https://github.com/sponsors/rawify"}},+ "node_modules/framer-motion": {+ "version": "12.23.24",+ "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.23.24.tgz",+ "integrity": "sha512-HMi5HRoRCTou+3fb3h9oTLyJGBxHfW+HnNE25tAXOvVx/IvwMHK0cx7IR4a2ZU6sh3IX1Z+4ts32PcYBOqka8w==",+ "license": "MIT",+ "dependencies": {+ "motion-dom": "^12.23.23",+ "motion-utils": "^12.23.6",+ "tslib": "^2.4.0"+ },+ "peerDependencies": {+ "@emotion/is-prop-valid": "*",+ "react": "^18.0.0 || ^19.0.0",+ "react-dom": "^18.0.0 || ^19.0.0"+ },+ "peerDependenciesMeta": {+ "@emotion/is-prop-valid": {+ "optional": true+ },+ "react": {+ "optional": true+ },+ "react-dom": {+ "optional": true+ }+ }+ },"node_modules/fs-constants": {"version": "1.0.0","resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",@@ -7426,6 +7639,12 @@"dev": true,"license": "MIT"},+ "node_modules/gsap": {+ "version": "3.13.0",+ "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.13.0.tgz",+ "integrity": "sha512-QL7MJ2WMjm1PHWsoFrAQH/J8wUeqZvMtHO58qdekHpCfhvhSL4gSiz6vJf5EeMP0LOn3ZCprL2ki/gjED8ghVw==",+ "license": "Standard 'no charge' license: https://gsap.com/standard-license."+ },"node_modules/har-schema": {"version": "2.0.0","resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",@@ -9319,6 +9538,47 @@"node": ">=10"}},+ "node_modules/motion": {+ "version": "12.23.24",+ "resolved": "https://registry.npmjs.org/motion/-/motion-12.23.24.tgz",+ "integrity": "sha512-Rc5E7oe2YZ72N//S3QXGzbnXgqNrTESv8KKxABR20q2FLch9gHLo0JLyYo2hZ238bZ9Gx6cWhj9VO0IgwbMjCw==",+ "license": "MIT",+ "dependencies": {+ "framer-motion": "^12.23.24",+ "tslib": "^2.4.0"+ },+ "peerDependencies": {+ "@emotion/is-prop-valid": "*",+ "react": "^18.0.0 || ^19.0.0",+ "react-dom": "^18.0.0 || ^19.0.0"+ },+ "peerDependenciesMeta": {+ "@emotion/is-prop-valid": {+ "optional": true+ },+ "react": {+ "optional": true+ },+ "react-dom": {+ "optional": true+ }+ }+ },+ "node_modules/motion-dom": {+ "version": "12.23.23",+ "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.23.23.tgz",+ "integrity": "sha512-n5yolOs0TQQBRUFImrRfs/+6X4p3Q4n1dUEqt/H58Vx7OW6RF+foWEgmTVDhIWJIMXOuNNL0apKH2S16en9eiA==",+ "license": "MIT",+ "dependencies": {+ "motion-utils": "^12.23.6"+ }+ },+ "node_modules/motion-utils": {+ "version": "12.23.6",+ "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.23.6.tgz",+ "integrity": "sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==",+ "license": "MIT"+ },"node_modules/mp4box": {"version": "2.2.0","resolved": "https://registry.npmjs.org/mp4box/-/mp4box-2.2.0.tgz",@@ -10414,6 +10674,17 @@"node": ">=10"}},+ "node_modules/prop-types": {+ "version": "15.8.1",+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",+ "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",+ "license": "MIT",+ "dependencies": {+ "loose-envify": "^1.4.0",+ "object-assign": "^4.1.1",+ "react-is": "^16.13.1"+ }+ },"node_modules/psl": {"version": "1.15.0","resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",@@ -10497,6 +10768,16 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/re-resizable": {+ "version": "6.11.2",+ "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.11.2.tgz",+ "integrity": "sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==",+ "license": "MIT",+ "peerDependencies": {+ "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",+ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"+ }+ },"node_modules/react": {"version": "18.3.1","resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",@@ -10522,6 +10803,29 @@"react": "^18.3.1"}},+ "node_modules/react-draggable": {+ "version": "4.4.6",+ "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.6.tgz",+ "integrity": "sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==",+ "license": "MIT",+ "dependencies": {+ "clsx": "^1.1.1",+ "prop-types": "^15.8.1"+ },+ "peerDependencies": {+ "react": ">= 16.3.0",+ "react-dom": ">= 16.3.0"+ }+ },+ "node_modules/react-draggable/node_modules/clsx": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",+ "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },"node_modules/react-icons": {"version": "5.5.0","resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",@@ -10531,6 +10835,12 @@"react": "*"}},+ "node_modules/react-is": {+ "version": "16.13.1",+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",+ "license": "MIT"+ },"node_modules/react-refresh": {"version": "0.17.0","resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",@@ -10598,6 +10908,27 @@"react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"}},+ "node_modules/react-rnd": {+ "version": "10.5.2",+ "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.5.2.tgz",+ "integrity": "sha512-0Tm4x7k7pfHf2snewJA8x7Nwgt3LV+58MVEWOVsFjk51eYruFEa6Wy7BNdxt4/lH0wIRsu7Gm3KjSXY2w7YaNw==",+ "license": "MIT",+ "dependencies": {+ "re-resizable": "6.11.2",+ "react-draggable": "4.4.6",+ "tslib": "2.6.2"+ },+ "peerDependencies": {+ "react": ">=16.3.0",+ "react-dom": ">=16.3.0"+ }+ },+ "node_modules/react-rnd/node_modules/tslib": {+ "version": "2.6.2",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",+ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",+ "license": "0BSD"+ },"node_modules/react-style-singleton": {"version": "2.2.3","resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",diff --git a/package.json b/package.jsonindex e15e0983..fca930c8 100644--- a/package.json+++ b/package.json@@ -16,23 +16,31 @@"@pixi/filter-drop-shadow": "^5.2.0","@radix-ui/react-dialog": "^1.1.15","@radix-ui/react-dropdown-menu": "^2.1.16",+ "@radix-ui/react-popover": "^1.1.15",+ "@radix-ui/react-select": "^2.2.6","@radix-ui/react-slider": "^1.3.6","@radix-ui/react-slot": "^1.2.3","@radix-ui/react-switch": "^1.2.6","@radix-ui/react-tabs": "^1.1.13",+ "@radix-ui/react-toggle": "^1.1.10",+ "@radix-ui/react-toggle-group": "^1.1.11","@uiw/color-convert": "^2.9.2","@uiw/react-color-colorful": "^2.9.0","class-variance-authority": "^0.7.1","clsx": "^2.1.1","dnd-timeline": "^2.2.0",+ "emoji-picker-react": "^4.16.1",+ "gsap": "^3.13.0","lucide-react": "^0.545.0","mediabunny": "^1.25.1",+ "motion": "^12.23.24","mp4box": "^2.2.0","pixi.js": "^8.14.0","react": "^18.2.0","react-dom": "^18.2.0","react-icons": "^5.5.0","react-resizable-panels": "^3.0.6",+ "react-rnd": "^10.5.2","sonner": "^2.0.7","tailwind-merge": "^3.3.1","tailwindcss-animate": "^1.0.7",diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsxnew file mode 100644index 00000000..01e468b6--- /dev/null+++ b/src/components/ui/popover.tsx@@ -0,0 +1,48 @@+"use client"++import * as React from "react"+import * as PopoverPrimitive from "@radix-ui/react-popover"++import { cn } from "@/lib/utils"++function Popover({+ ...props+}: React.ComponentProps<typeof PopoverPrimitive.Root>) {+ return <PopoverPrimitive.Root data-slot="popover" {...props} />+}++function PopoverTrigger({+ ...props+}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {+ return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />+}++function PopoverContent({+ className,+ align = "center",+ sideOffset = 4,+ ...props+}: React.ComponentProps<typeof PopoverPrimitive.Content>) {+ return (+ <PopoverPrimitive.Portal>+ <PopoverPrimitive.Content+ data-slot="popover-content"+ align={align}+ sideOffset={sideOffset}+ className={cn(+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",+ className+ )}+ {...props}+ />+ </PopoverPrimitive.Portal>+ )+}++function PopoverAnchor({+ ...props+}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {+ return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />+}++export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsxnew file mode 100644index 00000000..cbe5a36b--- /dev/null+++ b/src/components/ui/select.tsx@@ -0,0 +1,160 @@+"use client"++import * as React from "react"+import * as SelectPrimitive from "@radix-ui/react-select"+import { Check, ChevronDown, ChevronUp } from "lucide-react"++import { cn } from "@/lib/utils"++const Select = SelectPrimitive.Root++const SelectGroup = SelectPrimitive.Group++const SelectValue = SelectPrimitive.Value++const SelectTrigger = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.Trigger>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>+>(({ className, children, ...props }, ref) => (+ <SelectPrimitive.Trigger+ ref={ref}+ className={cn(+ "flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",+ className+ )}+ {...props}+ >+ {children}+ <SelectPrimitive.Icon asChild>+ <ChevronDown className="h-4 w-4 opacity-50" />+ </SelectPrimitive.Icon>+ </SelectPrimitive.Trigger>+))+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName++const SelectScrollUpButton = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>+>(({ className, ...props }, ref) => (+ <SelectPrimitive.ScrollUpButton+ ref={ref}+ className={cn(+ "flex cursor-default items-center justify-center py-1",+ className+ )}+ {...props}+ >+ <ChevronUp className="h-4 w-4" />+ </SelectPrimitive.ScrollUpButton>+))+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName++const SelectScrollDownButton = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>+>(({ className, ...props }, ref) => (+ <SelectPrimitive.ScrollDownButton+ ref={ref}+ className={cn(+ "flex cursor-default items-center justify-center py-1",+ className+ )}+ {...props}+ >+ <ChevronDown className="h-4 w-4" />+ </SelectPrimitive.ScrollDownButton>+))+SelectScrollDownButton.displayName =+ SelectPrimitive.ScrollDownButton.displayName++const SelectContent = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.Content>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>+>(({ className, children, position = "popper", ...props }, ref) => (+ <SelectPrimitive.Portal>+ <SelectPrimitive.Content+ ref={ref}+ className={cn(+ "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",+ position === "popper" &&+ "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",+ className+ )}+ position={position}+ {...props}+ >+ <SelectScrollUpButton />+ <SelectPrimitive.Viewport+ className={cn(+ "p-1",+ position === "popper" &&+ "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"+ )}+ >+ {children}+ </SelectPrimitive.Viewport>+ <SelectScrollDownButton />+ </SelectPrimitive.Content>+ </SelectPrimitive.Portal>+))+SelectContent.displayName = SelectPrimitive.Content.displayName++const SelectLabel = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.Label>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>+>(({ className, ...props }, ref) => (+ <SelectPrimitive.Label+ ref={ref}+ className={cn("py-1.5 pl-8 pr-2 text-sm font-semibold", className)}+ {...props}+ />+))+SelectLabel.displayName = SelectPrimitive.Label.displayName++const SelectItem = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.Item>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>+>(({ className, children, ...props }, ref) => (+ <SelectPrimitive.Item+ ref={ref}+ className={cn(+ "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",+ className+ )}+ {...props}+ >+ <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">+ <SelectPrimitive.ItemIndicator>+ <Check className="h-4 w-4" />+ </SelectPrimitive.ItemIndicator>+ </span>++ <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>+ </SelectPrimitive.Item>+))+SelectItem.displayName = SelectPrimitive.Item.displayName++const SelectSeparator = React.forwardRef<+ React.ElementRef<typeof SelectPrimitive.Separator>,+ React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>+>(({ className, ...props }, ref) => (+ <SelectPrimitive.Separator+ ref={ref}+ className={cn("-mx-1 my-1 h-px bg-muted", className)}+ {...props}+ />+))+SelectSeparator.displayName = SelectPrimitive.Separator.displayName++export {+ Select,+ SelectGroup,+ SelectValue,+ SelectTrigger,+ SelectContent,+ SelectLabel,+ SelectItem,+ SelectSeparator,+ SelectScrollUpButton,+ SelectScrollDownButton,+}diff --git a/src/components/ui/toggle-group.tsx b/src/components/ui/toggle-group.tsxnew file mode 100644index 00000000..1c876bbe--- /dev/null+++ b/src/components/ui/toggle-group.tsx@@ -0,0 +1,61 @@+"use client"++import * as React from "react"+import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"+import { type VariantProps } from "class-variance-authority"++import { cn } from "@/lib/utils"+import { toggleVariants } from "@/components/ui/toggle"++const ToggleGroupContext = React.createContext<+ VariantProps<typeof toggleVariants>+>({+ size: "default",+ variant: "default",+})++const ToggleGroup = React.forwardRef<+ React.ElementRef<typeof ToggleGroupPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root> &+ VariantProps<typeof toggleVariants>+>(({ className, variant, size, children, ...props }, ref) => (+ <ToggleGroupPrimitive.Root+ ref={ref}+ className={cn("flex items-center justify-center gap-1", className)}+ {...props}+ >+ <ToggleGroupContext.Provider value={{ variant, size }}>+ {children}+ </ToggleGroupContext.Provider>+ </ToggleGroupPrimitive.Root>+))++ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName++const ToggleGroupItem = React.forwardRef<+ React.ElementRef<typeof ToggleGroupPrimitive.Item>,+ React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Item> &+ VariantProps<typeof toggleVariants>+>(({ className, children, variant, size, ...props }, ref) => {+ const context = React.useContext(ToggleGroupContext)++ return (+ <ToggleGroupPrimitive.Item+ ref={ref}+ className={cn(+ toggleVariants({+ variant: context.variant || variant,+ size: context.size || size,+ }),+ className+ )}+ {...props}+ >+ {children}+ </ToggleGroupPrimitive.Item>+ )+})++ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName++export { ToggleGroup, ToggleGroupItem }diff --git a/src/components/ui/toggle.tsx b/src/components/ui/toggle.tsxnew file mode 100644index 00000000..b6f2e7d3--- /dev/null+++ b/src/components/ui/toggle.tsx@@ -0,0 +1,45 @@+"use client"++import * as React from "react"+import * as TogglePrimitive from "@radix-ui/react-toggle"+import { cva, type VariantProps } from "class-variance-authority"++import { cn } from "@/lib/utils"++const toggleVariants = cva(+ "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",+ {+ variants: {+ variant: {+ default: "bg-transparent",+ outline:+ "border border-input bg-transparent hover:bg-accent hover:text-accent-foreground",+ },+ size: {+ default: "h-10 px-3",+ sm: "h-9 px-2.5",+ lg: "h-11 px-5",+ },+ },+ defaultVariants: {+ variant: "default",+ size: "default",+ },+ }+)++const Toggle = React.forwardRef<+ React.ElementRef<typeof TogglePrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof TogglePrimitive.Root> &+ VariantProps<typeof toggleVariants>+>(({ className, variant, size, ...props }, ref) => (+ <TogglePrimitive.Root+ ref={ref}+ className={cn(toggleVariants({ variant, size, className }))}+ {...props}+ />+))++Toggle.displayName = TogglePrimitive.Root.displayName++export { Toggle, toggleVariants }diff --git a/src/components/video-editor/AnnotationOverlay.tsx b/src/components/video-editor/AnnotationOverlay.tsxnew file mode 100644index 00000000..1dd0d9ba--- /dev/null+++ b/src/components/video-editor/AnnotationOverlay.tsx@@ -0,0 +1,189 @@+import { Rnd } from "react-rnd";+import type { AnnotationRegion } from "./types";+import { cn } from "@/lib/utils";++interface AnnotationOverlayProps {+ annotation: AnnotationRegion;+ isSelected: boolean;+ containerWidth: number;+ containerHeight: number;+ onPositionChange: (id: string, position: { x: number; y: number }) => void;+ onSizeChange: (id: string, size: { width: number; height: number }) => void;+ onClick: (id: string) => void;+}++export function AnnotationOverlay({+ annotation,+ isSelected,+ containerWidth,+ containerHeight,+ onPositionChange,+ onSizeChange,+ onClick,+}: AnnotationOverlayProps) {+ const x = (annotation.position.x / 100) * containerWidth;+ const y = (annotation.position.y / 100) * containerHeight;+ const width = (annotation.size.width / 100) * containerWidth;+ const height = (annotation.size.height / 100) * containerHeight;++ console.log('[AnnotationOverlay] Rendering:', {+ id: annotation.id,+ type: annotation.type,+ content: annotation.content.substring(0, 30),+ position: annotation.position,+ size: annotation.size,+ containerWidth,+ containerHeight,+ calculatedPixels: { x, y, width, height },+ isSelected+ });++ const renderContent = () => {+ switch (annotation.type) {+ case 'text':+ return (+ <div+ className="w-full h-full flex items-center p-2 overflow-hidden"+ style={{+ justifyContent: annotation.style.textAlign === 'left' ? 'flex-start' :+ annotation.style.textAlign === 'right' ? 'flex-end' : 'center',+ alignItems: 'center',+ }}+ >+ <span+ style={{+ color: annotation.style.color,+ backgroundColor: annotation.style.backgroundColor,+ fontSize: `${annotation.style.fontSize}px`,+ fontFamily: annotation.style.fontFamily,+ fontWeight: annotation.style.fontWeight,+ fontStyle: annotation.style.fontStyle,+ textDecoration: annotation.style.textDecoration,+ textAlign: annotation.style.textAlign,+ wordBreak: 'break-word',+ whiteSpace: 'pre-wrap',+ textShadow: '0 2px 8px rgba(0,0,0,0.5), 0 0 2px rgba(0,0,0,0.8)',+ boxDecorationBreak: 'clone',+ WebkitBoxDecorationBreak: 'clone',+ padding: '0.1em 0.2em',+ borderRadius: '4px',+ lineHeight: '1.4',+ }}+ >+ {annotation.content}+ </span>+ </div>+ );++++ case 'image':+ if (annotation.content && annotation.content.startsWith('data:image')) {+ return (+ <img+ src={annotation.content}+ alt="Annotation"+ className="w-full h-full object-contain"+ draggable={false}+ />+ );+ }+ return (+ <div className="w-full h-full flex items-center justify-center text-slate-400 text-sm">+ No image+ </div>+ );++ default:+ return null;+ }+ };++ return (+ <Rnd+ position={{ x, y }}+ size={{ width, height }}+ onDragStop={(_e, d) => {+ const xPercent = (d.x / containerWidth) * 100;+ const yPercent = (d.y / containerHeight) * 100;+ onPositionChange(annotation.id, { x: xPercent, y: yPercent });+ }}+ onResizeStop={(_e, _direction, ref, _delta, position) => {+ const xPercent = (position.x / containerWidth) * 100;+ const yPercent = (position.y / containerHeight) * 100;+ const widthPercent = (ref.offsetWidth / containerWidth) * 100;+ const heightPercent = (ref.offsetHeight / containerHeight) * 100;+ onPositionChange(annotation.id, { x: xPercent, y: yPercent });+ onSizeChange(annotation.id, { width: widthPercent, height: heightPercent });+ }}+ onClick={() => onClick(annotation.id)}+ bounds="parent"+ className={cn(+ "cursor-move transition-all",+ isSelected && "ring-2 ring-[#34B27B] ring-offset-2 ring-offset-transparent"+ )}+ style={{+ zIndex: 9999,+ pointerEvents: isSelected ? 'auto' : 'none',+ border: isSelected ? '2px solid rgba(52, 178, 123, 0.8)' : 'none',+ backgroundColor: isSelected ? 'rgba(52, 178, 123, 0.1)' : 'transparent',+ boxShadow: isSelected ? '0 0 0 1px rgba(52, 178, 123, 0.35)' : 'none',+ }}+ enableResizing={isSelected}+ disableDragging={!isSelected}+ resizeHandleStyles={{+ topLeft: {+ width: '12px',+ height: '12px',+ backgroundColor: isSelected ? 'white' : 'transparent',+ border: isSelected ? '2px solid #34B27B' : 'none',+ borderRadius: '50%',+ left: '-6px',+ top: '-6px',+ cursor: 'nwse-resize',+ },+ topRight: {+ width: '12px',+ height: '12px',+ backgroundColor: isSelected ? 'white' : 'transparent',+ border: isSelected ? '2px solid #34B27B' : 'none',+ borderRadius: '50%',+ right: '-6px',+ top: '-6px',+ cursor: 'nesw-resize',+ },+ bottomLeft: {+ width: '12px',+ height: '12px',+ backgroundColor: isSelected ? 'white' : 'transparent',+ border: isSelected ? '2px solid #34B27B' : 'none',+ borderRadius: '50%',+ left: '-6px',+ bottom: '-6px',+ cursor: 'nesw-resize',+ },+ bottomRight: {+ width: '12px',+ height: '12px',+ backgroundColor: isSelected ? 'white' : 'transparent',+ border: isSelected ? '2px solid #34B27B' : 'none',+ borderRadius: '50%',+ right: '-6px',+ bottom: '-6px',+ cursor: 'nwse-resize',+ },+ }}+ >+ <div+ className={cn(+ "w-full h-full rounded-lg",+ annotation.type === 'text' && "bg-transparent",+ annotation.type === 'image' && "bg-transparent",+ isSelected && "shadow-lg"+ )}+ >+ {renderContent()}+ </div>+ </Rnd>+ );+}diff --git a/src/components/video-editor/AnnotationSettingsPanel.tsx b/src/components/video-editor/AnnotationSettingsPanel.tsxnew file mode 100644index 00000000..133e31be--- /dev/null+++ b/src/components/video-editor/AnnotationSettingsPanel.tsx@@ -0,0 +1,357 @@+import { useState, useRef } from "react";+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";+import { Button } from "@/components/ui/button";+import { Trash2, Type, Image as ImageIcon, Upload, Bold, Italic, Underline, AlignLeft, AlignCenter, AlignRight, ChevronDown } from "lucide-react";+import { toast } from "sonner";+import Colorful from '@uiw/react-color-colorful';+import { hsvaToHex, hexToHsva } from '@uiw/color-convert';+import type { AnnotationRegion, AnnotationType } from "./types";+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";++interface AnnotationSettingsPanelProps {+ annotation: AnnotationRegion;+ onContentChange: (content: string) => void;+ onTypeChange: (type: AnnotationType) => void;+ onStyleChange: (style: Partial<AnnotationRegion['style']>) => void;+ onDelete: () => void;+}++const FONT_FAMILIES = [+ { value: 'system-ui, -apple-system, sans-serif', label: 'Classic' },+ { value: 'Georgia, serif', label: 'Editor' },+ { value: 'Impact, Arial Black, sans-serif', label: 'Strong' },+ { value: 'Courier New, monospace', label: 'Typewriter' },+ { value: 'Brush Script MT, cursive', label: 'Deco' },+ { value: 'Arial, sans-serif', label: 'Simple' },+ { value: 'Verdana, sans-serif', label: 'Modern' },+ { value: 'Trebuchet MS, sans-serif', label: 'Clean' },+];++const FONT_SIZES = [12, 14, 16, 18, 20, 24, 28, 32, 36, 40, 48, 56, 64, 72, 80, 96, 128];++export function AnnotationSettingsPanel({+ annotation,+ onContentChange,+ onTypeChange,+ onStyleChange,+ onDelete,+}: AnnotationSettingsPanelProps) {+ const fileInputRef = useRef<HTMLInputElement>(null);+ const [textColorHsva, setTextColorHsva] = useState(hexToHsva(annotation.style.color));+ const [bgColorHsva, setBgColorHsva] = useState(hexToHsva(annotation.style.backgroundColor || '#00000000'));++++ const handleImageUpload = (event: React.ChangeEvent<HTMLInputElement>) => {+ const files = event.target.files;+ if (!files || files.length === 0) return;++ const file = files[0];++ // Validate file type+ const validTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];+ if (!validTypes.includes(file.type)) {+ toast.error('Invalid file type', {+ description: 'Please upload a JPG, PNG, GIF, or WebP image file.',+ });+ event.target.value = '';+ return;+ }++ const reader = new FileReader();++ reader.onload = (e) => {+ const dataUrl = e.target?.result as string;+ if (dataUrl) {+ onContentChange(dataUrl);+ toast.success('Image uploaded successfully!');+ }+ };++ reader.onerror = () => {+ toast.error('Failed to upload image', {+ description: 'There was an error reading the file.',+ });+ };++ reader.readAsDataURL(file);+ event.target.value = '';+ };++ return (+ <div className="flex-[2] min-w-0 bg-[#09090b] border border-white/5 rounded-2xl p-4 flex flex-col shadow-xl h-full overflow-y-auto custom-scrollbar">+ <div className="mb-6">+ <div className="flex items-center justify-between mb-4">+ <span className="text-sm font-medium text-slate-200">Annotation Settings</span>+ <span className="text-[10px] uppercase tracking-wider font-medium text-[#34B27B] bg-[#34B27B]/10 px-2 py-1 rounded-full">+ Active+ </span>+ </div>++ {/* Type Selector */}+ <Tabs value={annotation.type} onValueChange={(value) => onTypeChange(value as AnnotationType)} className="mb-6">+ <TabsList className="mb-4 bg-white/5 border border-white/5 p-1 w-full grid grid-cols-2 h-auto rounded-xl">+ <TabsTrigger value="text" className="data-[state=active]:bg-[#34B27B] data-[state=active]:text-white text-slate-400 py-2 rounded-lg transition-all gap-2">+ <Type className="w-4 h-4" />+ Text+ </TabsTrigger>+ <TabsTrigger value="image" className="data-[state=active]:bg-[#34B27B] data-[state=active]:text-white text-slate-400 py-2 rounded-lg transition-all gap-2">+ <ImageIcon className="w-4 h-4" />+ Image+ </TabsTrigger>+ </TabsList>++ {/* Text Content */}+ <TabsContent value="text" className="mt-0 space-y-4">+ <div>+ <label className="text-xs font-medium text-slate-200 mb-2 block">Text Content</label>+ <textarea+ value={annotation.content}+ onChange={(e) => onContentChange(e.target.value)}+ placeholder="Enter your text..."+ rows={5}+ className="w-full px-3 py-2 bg-white/5 border border-white/10 rounded-lg text-slate-200 text-sm placeholder:text-slate-500 focus:outline-none focus:ring-2 focus:ring-[#34B27B] focus:border-transparent resize-none"+ />+ </div>++ {/* Styling Controls */}+ <div className="space-y-4">+ {/* Font Family & Size */}+ <div className="grid grid-cols-2 gap-2">+ <div>+ <label className="text-xs font-medium text-slate-200 mb-2 block">Font Style</label>+ <Select+ value={annotation.style.fontFamily}+ onValueChange={(value) => onStyleChange({ fontFamily: value })}+ >+ <SelectTrigger className="w-full bg-white/5 border-white/10 text-slate-200 h-9 text-xs">+ <SelectValue placeholder="Select style" />+ </SelectTrigger>+ <SelectContent className="bg-[#1a1a1c] border-white/10 text-slate-200">+ {FONT_FAMILIES.map((font) => (+ <SelectItem key={font.value} value={font.value} style={{ fontFamily: font.value }}>+ {font.label}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ <div>+ <label className="text-xs font-medium text-slate-200 mb-2 block">Size</label>+ <Select+ value={annotation.style.fontSize.toString()}+ onValueChange={(value) => onStyleChange({ fontSize: parseInt(value) })}+ >+ <SelectTrigger className="w-full bg-white/5 border-white/10 text-slate-200 h-9 text-xs">+ <SelectValue placeholder="Size" />+ </SelectTrigger>+ <SelectContent className="bg-[#1a1a1c] border-white/10 text-slate-200 max-h-[200px]">+ {FONT_SIZES.map((size) => (+ <SelectItem key={size} value={size.toString()}>+ {size}px+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ </div>++ {/* Formatting Toggles */}+ <div className="flex items-center justify-between gap-2">+ <ToggleGroup type="multiple" className="justify-start bg-white/5 p-1 rounded-lg border border-white/5">+ <ToggleGroupItem+ value="bold"+ aria-label="Toggle bold"+ data-state={annotation.style.fontWeight === 'bold' ? 'on' : 'off'}+ onClick={() => onStyleChange({ fontWeight: annotation.style.fontWeight === 'bold' ? 'normal' : 'bold' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <Bold className="h-4 w-4" />+ </ToggleGroupItem>+ <ToggleGroupItem+ value="italic"+ aria-label="Toggle italic"+ data-state={annotation.style.fontStyle === 'italic' ? 'on' : 'off'}+ onClick={() => onStyleChange({ fontStyle: annotation.style.fontStyle === 'italic' ? 'normal' : 'italic' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <Italic className="h-4 w-4" />+ </ToggleGroupItem>+ <ToggleGroupItem+ value="underline"+ aria-label="Toggle underline"+ data-state={annotation.style.textDecoration === 'underline' ? 'on' : 'off'}+ onClick={() => onStyleChange({ textDecoration: annotation.style.textDecoration === 'underline' ? 'none' : 'underline' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <Underline className="h-4 w-4" />+ </ToggleGroupItem>+ </ToggleGroup>++ <ToggleGroup type="single" value={annotation.style.textAlign} className="justify-start bg-white/5 p-1 rounded-lg border border-white/5">+ <ToggleGroupItem+ value="left"+ aria-label="Align left"+ onClick={() => onStyleChange({ textAlign: 'left' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <AlignLeft className="h-4 w-4" />+ </ToggleGroupItem>+ <ToggleGroupItem+ value="center"+ aria-label="Align center"+ onClick={() => onStyleChange({ textAlign: 'center' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <AlignCenter className="h-4 w-4" />+ </ToggleGroupItem>+ <ToggleGroupItem+ value="right"+ aria-label="Align right"+ onClick={() => onStyleChange({ textAlign: 'right' })}+ className="h-8 w-8 data-[state=on]:bg-[#34B27B] data-[state=on]:text-white text-slate-400 hover:bg-white/5 hover:text-slate-200"+ >+ <AlignRight className="h-4 w-4" />+ </ToggleGroupItem>+ </ToggleGroup>+ </div>++ {/* Colors */}+ <div className="grid grid-cols-2 gap-4">+ <div>+ <label className="text-xs font-medium text-slate-200 mb-2 block">Text Color</label>+ <Popover>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ className="w-full h-9 justify-start gap-2 bg-white/5 border-white/10 hover:bg-white/10 px-2"+ >+ <div+ className="w-4 h-4 rounded-full border border-white/20"+ style={{ backgroundColor: annotation.style.color }}+ />+ <span className="text-xs text-slate-300 truncate flex-1 text-left">+ {annotation.style.color}+ </span>+ <ChevronDown className="h-3 w-3 opacity-50" />+ </Button>+ </PopoverTrigger>+ <PopoverContent className="w-auto p-0 border-none bg-transparent shadow-xl">+ <div className="p-2 bg-[#1a1a1c] border border-white/10 rounded-xl">+ <Colorful+ color={textColorHsva}+ disableAlpha={true}+ onChange={(color) => {+ setTextColorHsva(color.hsva);+ onStyleChange({ color: hsvaToHex(color.hsva) });+ }}+ style={{ width: '100%', borderRadius: '8px' }}+ />+ </div>+ </PopoverContent>+ </Popover>+ </div>+ <div>+ <label className="text-xs font-medium text-slate-200 mb-2 block">Background</label>+ <Popover>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ className="w-full h-9 justify-start gap-2 bg-white/5 border-white/10 hover:bg-white/10 px-2"+ >+ <div+ className="w-4 h-4 rounded-full border border-white/20 relative overflow-hidden"+ >+ <div className="absolute inset-0 checkerboard-bg opacity-50" />+ <div+ className="absolute inset-0"+ style={{ backgroundColor: annotation.style.backgroundColor }}+ />+ </div>+ <span className="text-xs text-slate-300 truncate flex-1 text-left">+ {annotation.style.backgroundColor === 'transparent' ? 'None' : 'Color'}+ </span>+ <ChevronDown className="h-3 w-3 opacity-50" />+ </Button>+ </PopoverTrigger>+ <PopoverContent className="w-auto p-0 border-none bg-transparent shadow-xl">+ <div className="p-2 bg-[#1a1a1c] border border-white/10 rounded-xl">+ <Colorful+ color={bgColorHsva}+ onChange={(color) => {+ setBgColorHsva(color.hsva);+ onStyleChange({ backgroundColor: hsvaToHex(color.hsva) });+ }}+ style={{ width: '100%', borderRadius: '8px' }}+ />+ <Button+ variant="ghost"+ size="sm"+ className="w-full mt-2 text-xs h-7 hover:bg-white/5 text-slate-400"+ onClick={() => {+ onStyleChange({ backgroundColor: 'transparent' });+ setBgColorHsva({ h: 0, s: 0, v: 0, a: 0 });+ }}+ >+ Clear Background+ </Button>+ </div>+ </PopoverContent>+ </Popover>+ </div>+ </div>+ </div>+++ </TabsContent>++ {/* Image Upload */}+ <TabsContent value="image" className="mt-0 space-y-4">+ <input+ type="file"+ ref={fileInputRef}+ onChange={handleImageUpload}+ accept=".jpg,.jpeg,.png,.gif,.webp,image/*"+ className="hidden"+ />+ <Button+ onClick={() => fileInputRef.current?.click()}+ variant="outline"+ className="w-full gap-2 bg-white/5 text-slate-200 border-white/10 hover:bg-[#34B27B] hover:text-white hover:border-[#34B27B] transition-all py-8"+ >+ <Upload className="w-5 h-5" />+ Upload Image+ </Button>++ {annotation.content && annotation.content.startsWith('data:image') && (+ <div className="rounded-lg border border-white/10 overflow-hidden bg-white/5 p-2">+ <img+ src={annotation.content}+ alt="Uploaded annotation"+ className="w-full h-auto rounded-md"+ />+ </div>+ )}++ <p className="text-xs text-slate-500 text-center leading-relaxed">+ Supported formats: JPG, PNG, GIF, WebP+ </p>+ </TabsContent>+ </Tabs>++ {/* Delete Button */}+ <Button+ onClick={onDelete}+ variant="destructive"+ size="sm"+ className="w-full gap-2 bg-red-500/10 text-red-400 border border-red-500/20 hover:bg-red-500/20 hover:border-red-500/30 transition-all mt-4"+ >+ <Trash2 className="w-4 h-4" />+ Delete Annotation+ </Button>+ </div>+ </div>+ );+}diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsxindex 982d71a1..c369c86a 100644--- a/src/components/video-editor/SettingsPanel.tsx+++ b/src/components/video-editor/SettingsPanel.tsx@@ -11,9 +11,10 @@ import { hsvaToHex } from '@uiw/color-convert';import { Trash2, Download, Crop, X, Bug, Upload } from "lucide-react";import { GiHearts } from "react-icons/gi";import { toast } from "sonner";-import type { ZoomDepth, CropRegion } from "./types";+import type { ZoomDepth, CropRegion, AnnotationRegion, AnnotationType } from "./types";import { CropControl } from "./CropControl";import { KeyboardShortcutsHelp } from "./KeyboardShortcutsHelp";+import { AnnotationSettingsPanel } from "./AnnotationSettingsPanel";import { type AspectRatio } from "@/utils/aspectRatioUtils";const WALLPAPER_COUNT = 18;@@ -67,6 +68,12 @@ interface SettingsPanelProps {aspectRatio: AspectRatio;videoElement?: HTMLVideoElement | null;onExport?: () => void;+ selectedAnnotationId?: string | null;+ annotationRegions?: AnnotationRegion[];+ onAnnotationContentChange?: (id: string, content: string) => void;+ onAnnotationTypeChange?: (id: string, type: AnnotationType) => void;+ onAnnotationStyleChange?: (id: string, style: Partial<AnnotationRegion['style']>) => void;+ onAnnotationDelete?: (id: string) => void;}export default SettingsPanel;@@ -80,7 +87,35 @@ const ZOOM_DEPTH_OPTIONS: Array<{ depth: ZoomDepth; label: string }> = [{ depth: 6, label: "5×" },];-export function SettingsPanel({ selected, onWallpaperChange, selectedZoomDepth, onZoomDepthChange, selectedZoomId, onZoomDelete, shadowIntensity = 0, onShadowChange, showBlur, onBlurChange, motionBlurEnabled = true, onMotionBlurChange, borderRadius = 0, onBorderRadiusChange, padding = 50, onPaddingChange, cropRegion, onCropChange, aspectRatio, videoElement, onExport }: SettingsPanelProps) {+export function SettingsPanel({+ selected,+ onWallpaperChange,+ selectedZoomDepth,+ onZoomDepthChange,+ selectedZoomId,+ onZoomDelete,+ shadowIntensity = 0,+ onShadowChange,+ showBlur,+ onBlurChange,+ motionBlurEnabled = true,+ onMotionBlurChange,+ borderRadius = 0,+ onBorderRadiusChange,+ padding = 50,+ onPaddingChange,+ cropRegion,+ onCropChange,+ aspectRatio,+ videoElement,+ onExport,+ selectedAnnotationId,+ annotationRegions = [],+ onAnnotationContentChange,+ onAnnotationTypeChange,+ onAnnotationStyleChange,+ onAnnotationDelete,+}: SettingsPanelProps) {const [wallpaperPaths, setWallpaperPaths] = useState<string[]>([]);const [customImages, setCustomImages] = useState<string[]>([]);const fileInputRef = useRef<HTMLInputElement>(null);@@ -156,6 +191,24 @@ export function SettingsPanel({ selected, onWallpaperChange, selectedZoomDepth,}};+ // Find selected annotation+ const selectedAnnotation = selectedAnnotationId+ ? annotationRegions.find(a => a.id === selectedAnnotationId)+ : null;++ // If an annotation is selected, show annotation settings instead+ if (selectedAnnotation && onAnnotationContentChange && onAnnotationTypeChange && onAnnotationStyleChange && onAnnotationDelete) {+ return (+ <AnnotationSettingsPanel+ annotation={selectedAnnotation}+ onContentChange={(content) => onAnnotationContentChange(selectedAnnotation.id, content)}+ onTypeChange={(type) => onAnnotationTypeChange(selectedAnnotation.id, type)}+ onStyleChange={(style) => onAnnotationStyleChange(selectedAnnotation.id, style)}+ onDelete={() => onAnnotationDelete(selectedAnnotation.id)}+ />+ );+ }+return (<div className="flex-[2] min-w-0 bg-[#09090b] border border-white/5 rounded-2xl p-4 flex flex-col shadow-xl h-full overflow-y-auto custom-scrollbar"><div className="mb-6">diff --git a/src/components/video-editor/VideoEditor.tsx b/src/components/video-editor/VideoEditor.tsxindex 847f932a..bbeafb62 100644--- a/src/components/video-editor/VideoEditor.tsx+++ b/src/components/video-editor/VideoEditor.tsx@@ -16,10 +16,14 @@ import {DEFAULT_ZOOM_DEPTH,clampFocusToDepth,DEFAULT_CROP_REGION,+ DEFAULT_ANNOTATION_POSITION,+ DEFAULT_ANNOTATION_SIZE,+ DEFAULT_ANNOTATION_STYLE,type ZoomDepth,type ZoomFocus,type ZoomRegion,type TrimRegion,+ type AnnotationRegion,type CropRegion,} from "./types";import { VideoExporter, type ExportProgress } from "@/lib/exporter";@@ -46,6 +50,8 @@ export default function VideoEditor() {const [selectedZoomId, setSelectedZoomId] = useState<string | null>(null);const [trimRegions, setTrimRegions] = useState<TrimRegion[]>([]);const [selectedTrimId, setSelectedTrimId] = useState<string | null>(null);+ const [annotationRegions, setAnnotationRegions] = useState<AnnotationRegion[]>([]);+ const [selectedAnnotationId, setSelectedAnnotationId] = useState<string | null>(null);const [isExporting, setIsExporting] = useState(false);const [exportProgress, setExportProgress] = useState<ExportProgress | null>(null);const [exportError, setExportError] = useState<string | null>(null);@@ -55,6 +61,7 @@ export default function VideoEditor() {const videoPlaybackRef = useRef<VideoPlaybackRef>(null);const nextZoomIdRef = useRef(1);const nextTrimIdRef = useRef(1);+ const nextAnnotationIdRef = useRef(1);const exporterRef = useRef<VideoExporter | null>(null);// Helper to convert file path to proper file:// URL@@ -118,7 +125,18 @@ export default function VideoEditor() {const handleSelectTrim = useCallback((id: string | null) => {setSelectedTrimId(id);- if (id) setSelectedZoomId(null);+ if (id) {+ setSelectedZoomId(null);+ setSelectedAnnotationId(null);+ }+ }, []);++ const handleSelectAnnotation = useCallback((id: string | null) => {+ setSelectedAnnotationId(id);+ if (id) {+ setSelectedZoomId(null);+ setSelectedTrimId(null);+ }}, []);const handleZoomAdded = useCallback((span: Span) => {@@ -134,6 +152,7 @@ export default function VideoEditor() {setZoomRegions((prev) => [...prev, newRegion]);setSelectedZoomId(id);setSelectedTrimId(null);+ setSelectedAnnotationId(null);}, []);const handleTrimAdded = useCallback((span: Span) => {@@ -147,6 +166,7 @@ export default function VideoEditor() {setTrimRegions((prev) => [...prev, newRegion]);setSelectedTrimId(id);setSelectedZoomId(null);+ setSelectedAnnotationId(null);}, []);const handleZoomSpanChange = useCallback((id: string, span: Span) => {@@ -223,6 +243,109 @@ export default function VideoEditor() {}}, [selectedTrimId]);+ const handleAnnotationAdded = useCallback((span: Span) => {+ const id = `annotation-${nextAnnotationIdRef.current++}`;+ const newRegion: AnnotationRegion = {+ id,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ type: 'text',+ content: 'Enter text...',+ position: { ...DEFAULT_ANNOTATION_POSITION },+ size: { ...DEFAULT_ANNOTATION_SIZE },+ style: { ...DEFAULT_ANNOTATION_STYLE },+ };+ console.log('Annotation region added:', newRegion);+ setAnnotationRegions((prev) => [...prev, newRegion]);+ setSelectedAnnotationId(id);+ setSelectedZoomId(null);+ setSelectedTrimId(null);+ }, []);++ const handleAnnotationSpanChange = useCallback((id: string, span: Span) => {+ console.log('Annotation span changed:', { id, start: Math.round(span.start), end: Math.round(span.end) });+ setAnnotationRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? {+ ...region,+ startMs: Math.round(span.start),+ endMs: Math.round(span.end),+ }+ : region,+ ),+ );+ }, []);++ const handleAnnotationDelete = useCallback((id: string) => {+ console.log('Annotation region deleted:', id);+ setAnnotationRegions((prev) => prev.filter((region) => region.id !== id));+ if (selectedAnnotationId === id) {+ setSelectedAnnotationId(null);+ }+ }, [selectedAnnotationId]);++ const handleAnnotationContentChange = useCallback((id: string, content: string) => {+ console.log('[VideoEditor] Annotation content changed:', { id, content });+ setAnnotationRegions((prev) => {+ const updated = prev.map((region) =>+ region.id === id+ ? { ...region, content }+ : region,+ );+ console.log('[VideoEditor] Updated annotation regions:', updated);+ return updated;+ });+ }, []);++ const handleAnnotationTypeChange = useCallback((id: string, type: AnnotationRegion['type']) => {+ console.log('[VideoEditor] Annotation type changed:', { id, type });+ setAnnotationRegions((prev) => {+ const updated = prev.map((region) =>+ region.id === id+ ? {+ ...region,+ type,+ content: type === 'text' ? 'Enter text...' : ''+ }+ : region,+ );+ console.log('[VideoEditor] Updated annotation regions after type change:', updated);+ return updated;+ });+ }, []);++ const handleAnnotationStyleChange = useCallback((id: string, style: Partial<AnnotationRegion['style']>) => {+ console.log('Annotation style changed:', { id, style });+ setAnnotationRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? { ...region, style: { ...region.style, ...style } }+ : region,+ ),+ );+ }, []);++ const handleAnnotationPositionChange = useCallback((id: string, position: { x: number; y: number }) => {+ setAnnotationRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? { ...region, position }+ : region,+ ),+ );+ }, []);++ const handleAnnotationSizeChange = useCallback((id: string, size: { width: number; height: number }) => {+ setAnnotationRegions((prev) =>+ prev.map((region) =>+ region.id === id+ ? { ...region, size }+ : region,+ ),+ );+ }, []);+useEffect(() => {if (selectedZoomId && !zoomRegions.some((region) => region.id === selectedZoomId)) {setSelectedZoomId(null);@@ -235,6 +358,12 @@ export default function VideoEditor() {}}, [selectedTrimId, trimRegions]);+ useEffect(() => {+ if (selectedAnnotationId && !annotationRegions.some((region) => region.id === selectedAnnotationId)) {+ setSelectedAnnotationId(null);+ }+ }, [selectedAnnotationId, annotationRegions]);+const handleExport = useCallback(async () => {if (!videoPath) {toast.error('No video loaded');@@ -433,6 +562,7 @@ export default function VideoEditor() {videoPath={videoPath || ''}onDurationChange={setDuration}onTimeUpdate={setCurrentTime}+ currentTime={currentTime}onPlayStateChange={setIsPlaying}onError={setError}wallpaper={wallpaper}@@ -449,6 +579,11 @@ export default function VideoEditor() {padding={padding}cropRegion={cropRegion}trimRegions={trimRegions}+ annotationRegions={annotationRegions}+ selectedAnnotationId={selectedAnnotationId}+ onSelectAnnotation={handleSelectAnnotation}+ onAnnotationPositionChange={handleAnnotationPositionChange}+ onAnnotationSizeChange={handleAnnotationSizeChange}/></div></div>@@ -490,6 +625,12 @@ export default function VideoEditor() {onTrimDelete={handleTrimDelete}selectedTrimId={selectedTrimId}onSelectTrim={handleSelectTrim}+ annotationRegions={annotationRegions}+ onAnnotationAdded={handleAnnotationAdded}+ onAnnotationSpanChange={handleAnnotationSpanChange}+ onAnnotationDelete={handleAnnotationDelete}+ selectedAnnotationId={selectedAnnotationId}+ onSelectAnnotation={handleSelectAnnotation}aspectRatio={aspectRatio}onAspectRatioChange={setAspectRatio}/>@@ -521,6 +662,12 @@ export default function VideoEditor() {aspectRatio={aspectRatio}videoElement={videoPlaybackRef.current?.video || null}onExport={handleExport}+ selectedAnnotationId={selectedAnnotationId}+ annotationRegions={annotationRegions}+ onAnnotationContentChange={handleAnnotationContentChange}+ onAnnotationTypeChange={handleAnnotationTypeChange}+ onAnnotationStyleChange={handleAnnotationStyleChange}+ onAnnotationDelete={handleAnnotationDelete}/></div>diff --git a/src/components/video-editor/VideoPlayback.tsx b/src/components/video-editor/VideoPlayback.tsxindex 8656dfb2..f12e79b6 100644--- a/src/components/video-editor/VideoPlayback.tsx+++ b/src/components/video-editor/VideoPlayback.tsx@@ -2,7 +2,7 @@ import type React from "react";import { useEffect, useRef, useImperativeHandle, forwardRef, useState, useMemo, useCallback } from "react";import { getAssetPath } from "@/lib/assetPath";import { Application, Container, Sprite, Graphics, BlurFilter, Texture, VideoSource } from 'pixi.js';-import { ZOOM_DEPTH_SCALES, type ZoomRegion, type ZoomFocus, type ZoomDepth, type TrimRegion } from "./types";+import { ZOOM_DEPTH_SCALES, type ZoomRegion, type ZoomFocus, type ZoomDepth, type TrimRegion, type AnnotationRegion } from "./types";import { DEFAULT_FOCUS, SMOOTHING_FACTOR, MIN_DELTA } from "./videoPlayback/constants";import { clamp01 } from "./videoPlayback/mathUtils";import { findDominantRegion } from "./videoPlayback/zoomRegionUtils";@@ -12,11 +12,13 @@ import { layoutVideoContent as layoutVideoContentUtil } from "./videoPlayback/laimport { applyZoomTransform } from "./videoPlayback/zoomTransform";import { createVideoEventHandlers } from "./videoPlayback/videoEventHandlers";import { type AspectRatio, formatAspectRatioForCSS } from "@/utils/aspectRatioUtils";+import { AnnotationOverlay } from "./AnnotationOverlay";interface VideoPlaybackProps {videoPath: string;onDurationChange: (duration: number) => void;onTimeUpdate: (time: number) => void;+ currentTime: number;onPlayStateChange: (playing: boolean) => void;onError: (error: string) => void;wallpaper?: string;@@ -34,6 +36,11 @@ interface VideoPlaybackProps {cropRegion?: import('./types').CropRegion;trimRegions?: TrimRegion[];aspectRatio: AspectRatio;+ annotationRegions?: AnnotationRegion[];+ selectedAnnotationId?: string | null;+ onSelectAnnotation?: (id: string | null) => void;+ onAnnotationPositionChange?: (id: string, position: { x: number; y: number }) => void;+ onAnnotationSizeChange?: (id: string, size: { width: number; height: number }) => void;}export interface VideoPlaybackRef {@@ -49,6 +56,7 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(({videoPath,onDurationChange,onTimeUpdate,+ currentTime,onPlayStateChange,onError,wallpaper,@@ -66,6 +74,11 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(({cropRegion,trimRegions = [],aspectRatio,+ annotationRegions = [],+ selectedAnnotationId,+ onSelectAnnotation,+ onAnnotationPositionChange,+ onAnnotationSizeChange,}, ref) => {const videoRef = useRef<HTMLVideoElement | null>(null);const containerRef = useRef<HTMLDivElement | null>(null);@@ -784,6 +797,25 @@ const VideoPlayback = forwardRef<VideoPlaybackRef, VideoPlaybackProps>(({className="absolute rounded-md border border-[#34B27B]/80 bg-[#34B27B]/20 shadow-[0_0_0_1px_rgba(52,178,123,0.35)]"style={{ display: 'none', pointerEvents: 'none' }}/>+ {(() => {+ const filtered = (annotationRegions || []).filter((annotation) => {+ if (typeof annotation.startMs !== 'number' || typeof annotation.endMs !== 'number') return false;+ const timeMs = Math.round(currentTime * 1000);+ return timeMs >= annotation.startMs && timeMs <= annotation.endMs;+ });+ return filtered.map((annotation) => (+ <AnnotationOverlay+ key={annotation.id}+ annotation={annotation}+ isSelected={annotation.id === selectedAnnotationId}+ containerWidth={overlayRef.current?.clientWidth || 800}+ containerHeight={overlayRef.current?.clientHeight || 600}+ onPositionChange={(id, position) => onAnnotationPositionChange?.(id, position)}+ onSizeChange={(id, size) => onAnnotationSizeChange?.(id, size)}+ onClick={(id) => onSelectAnnotation?.(id)}+ />+ ));+ })()}</div>)}<videodiff --git a/src/components/video-editor/timeline/Item.tsx b/src/components/video-editor/timeline/Item.tsxindex bd0b0df9..8f7242f5 100644--- a/src/components/video-editor/timeline/Item.tsx+++ b/src/components/video-editor/timeline/Item.tsx@@ -1,7 +1,7 @@import { useItem } from "dnd-timeline";import type { Span } from "dnd-timeline";import { cn } from "@/lib/utils";-import { ZoomIn, Scissors } from "lucide-react";+import { ZoomIn, Scissors, MessageSquare } from "lucide-react";import glassStyles from "./ItemGlass.module.css";interface ItemProps {@@ -12,7 +12,7 @@ interface ItemProps {isSelected?: boolean;onSelect?: () => void;zoomDepth?: number;- variant?: 'zoom' | 'trim';+ variant?: 'zoom' | 'trim' | 'annotation';}// Map zoom depth to multiplier labels@@ -41,8 +41,19 @@ export default function Item({});const isZoom = variant === 'zoom';- const glassClass = isZoom ? glassStyles.glassGreen : glassStyles.glassRed;- const endCapColor = isZoom ? '#21916A' : '#ef4444';+ const isTrim = variant === 'trim';++ const glassClass = isZoom+ ? glassStyles.glassGreen+ : isTrim+ ? glassStyles.glassRed+ : glassStyles.glassYellow;++ const endCapColor = isZoom+ ? '#21916A'+ : isTrim+ ? '#ef4444'+ : '#B4A046';return (<div@@ -85,13 +96,20 @@ export default function Item({{ZOOM_LABELS[zoomDepth] || `${zoomDepth}×`}</span></>- ) : (+ ) : isTrim ? (<><Scissors className="w-3.5 h-3.5" /><span className="text-[11px] font-semibold tracking-tight">Trim</span></>+ ) : (+ <>+ <MessageSquare className="w-3.5 h-3.5" />+ <span className="text-[11px] font-semibold tracking-tight">+ Note+ </span>+ </>)}</div></div>diff --git a/src/components/video-editor/timeline/ItemGlass.module.css b/src/components/video-editor/timeline/ItemGlass.module.cssindex 2a6e45f8..803269b8 100644--- a/src/components/video-editor/timeline/ItemGlass.module.css+++ b/src/components/video-editor/timeline/ItemGlass.module.css@@ -50,6 +50,32 @@z-index: 10;}+.glassYellow {+ position: relative;+ border-radius: 8px;+ -corner-smoothing: antialiased;+ background: rgba(180, 160, 70, 0.15);+ border: 1px solid rgba(180, 160, 70, 0.3);+ box-shadow: 0 2px 12px 0 rgba(180, 160, 70, 0.1) inset;+ margin: 2px 0;+ backdrop-filter: blur(4px);+ -webkit-backdrop-filter: blur(4px);+ transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);+}++.glassYellow:hover {+ background: rgba(180, 160, 70, 0.25);+ border-color: rgba(180, 160, 70, 0.5);+ box-shadow: 0 4px 20px 0 rgba(180, 160, 70, 0.2) inset;+}++.glassYellow.selected {+ background: rgba(180, 160, 70, 0.35);+ border-color: #B4A046;+ box-shadow: 0 0 0 1px #B4A046, 0 4px 20px 0 rgba(180, 160, 70, 0.3) inset;+ z-index: 10;+}+.zoomEndCap {position: absolute;top: 0;@@ -62,7 +88,11 @@}.glassGreen:hover .zoomEndCap,-.glassGreen.selected .zoomEndCap {+.glassGreen.selected .zoomEndCap,+.glassRed:hover .zoomEndCap,+.glassRed.selected .zoomEndCap,+.glassYellow:hover .zoomEndCap,+.glassYellow.selected .zoomEndCap {opacity: 1;}@@ -72,9 +102,10 @@border-top-left-radius: 7px;border-bottom-left-radius: 7px;}+.zoomEndCap.right {right: 0;cursor: ew-resize;border-top-right-radius: 7px;border-bottom-right-radius: 7px;-}+}\ No newline at end of filediff --git a/src/components/video-editor/timeline/TimelineEditor.tsx b/src/components/video-editor/timeline/TimelineEditor.tsxindex 907081d0..07760e60 100644--- a/src/components/video-editor/timeline/TimelineEditor.tsx+++ b/src/components/video-editor/timeline/TimelineEditor.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useMemo, useState } from "react";import { useTimelineContext } from "dnd-timeline";import { Button } from "@/components/ui/button";-import { Plus, Scissors, ZoomIn, ChevronDown, Check } from "lucide-react";+import { Plus, Scissors, ZoomIn, MessageSquare, ChevronDown, Check } from "lucide-react";import { toast } from "sonner";import { cn } from "@/lib/utils";import TimelineWrapper from "./TimelineWrapper";@@ -9,7 +9,7 @@ import Row from "./Row";import Item from "./Item";import KeyframeMarkers from "./KeyframeMarkers";import type { Range, Span } from "dnd-timeline";-import type { ZoomRegion, TrimRegion } from "../types";+import type { ZoomRegion, TrimRegion, AnnotationRegion } from "../types";import { v4 as uuidv4 } from 'uuid';import {DropdownMenu,@@ -21,6 +21,7 @@ import { type AspectRatio, getAspectRatioLabel } from "@/utils/aspectRatioUtils"const ZOOM_ROW_ID = "row-zoom";const TRIM_ROW_ID = "row-trim";+const ANNOTATION_ROW_ID = "row-annotation";const FALLBACK_RANGE_MS = 1000;const TARGET_MARKER_COUNT = 12;@@ -34,13 +35,18 @@ interface TimelineEditorProps {onZoomDelete: (id: string) => void;selectedZoomId: string | null;onSelectZoom: (id: string | null) => void;- // Trim propstrimRegions?: TrimRegion[];onTrimAdded?: (span: Span) => void;onTrimSpanChange?: (id: string, span: Span) => void;onTrimDelete?: (id: string) => void;selectedTrimId?: string | null;onSelectTrim?: (id: string | null) => void;+ annotationRegions?: AnnotationRegion[];+ onAnnotationAdded?: (span: Span) => void;+ onAnnotationSpanChange?: (id: string, span: Span) => void;+ onAnnotationDelete?: (id: string) => void;+ selectedAnnotationId?: string | null;+ onSelectAnnotation?: (id: string | null) => void;aspectRatio: AspectRatio;onAspectRatioChange: (aspectRatio: AspectRatio) => void;}@@ -59,7 +65,7 @@ interface TimelineRenderItem {span: Span;label: string;zoomDepth?: number;- variant: 'zoom' | 'trim';+ variant: 'zoom' | 'trim' | 'annotation';}const SCALE_CANDIDATES = [@@ -318,8 +324,10 @@ function Timeline({onSeek,onSelectZoom,onSelectTrim,+ onSelectAnnotation,selectedZoomId,selectedTrimId,+ selectedAnnotationId,}: {items: TimelineRenderItem[];videoDurationMs: number;@@ -328,8 +336,10 @@ function Timeline({onSeek?: (time: number) => void;onSelectZoom?: (id: string | null) => void;onSelectTrim?: (id: string | null) => void;+ onSelectAnnotation?: (id: string | null) => void;selectedZoomId: string | null;selectedTrimId?: string | null;+ selectedAnnotationId?: string | null;}) {const { setTimelineRef, style, sidebarWidth, range, pixelsToValue } = useTimelineContext();@@ -340,6 +350,7 @@ function Timeline({// This is handled by event propagation - items stop propagationonSelectZoom?.(null);onSelectTrim?.(null);+ onSelectAnnotation?.(null);const rect = e.currentTarget.getBoundingClientRect();const clickX = e.clientX - rect.left - sidebarWidth;@@ -351,10 +362,11 @@ function Timeline({const timeInSeconds = absoluteMs / 1000;onSeek(timeInSeconds);- }, [onSeek, onSelectZoom, onSelectTrim, videoDurationMs, sidebarWidth, range.start, pixelsToValue]);+ }, [onSeek, onSelectZoom, onSelectTrim, onSelectAnnotation, videoDurationMs, sidebarWidth, range.start, pixelsToValue]);const zoomItems = items.filter(item => item.rowId === ZOOM_ROW_ID);const trimItems = items.filter(item => item.rowId === TRIM_ROW_ID);+ const annotationItems = items.filter(item => item.rowId === ANNOTATION_ROW_ID);return (<div@@ -399,6 +411,22 @@ function Timeline({</Item>))}</Row>++ <Row id={ANNOTATION_ROW_ID}>+ {annotationItems.map((item) => (+ <Item+ id={item.id}+ key={item.id}+ rowId={item.rowId}+ span={item.span}+ isSelected={item.id === selectedAnnotationId}+ onSelect={() => onSelectAnnotation?.(item.id)}+ variant="annotation"+ >+ {item.label}+ </Item>+ ))}+ </Row></div>);}@@ -419,6 +447,12 @@ export default function TimelineEditor({onTrimDelete,selectedTrimId,onSelectTrim,+ annotationRegions = [],+ onAnnotationAdded,+ onAnnotationSpanChange,+ onAnnotationDelete,+ selectedAnnotationId,+ onSelectAnnotation,aspectRatio,onAspectRatioChange,}: TimelineEditorProps) {@@ -463,6 +497,12 @@ export default function TimelineEditor({onSelectTrim(null);}, [selectedTrimId, onTrimDelete, onSelectTrim]);+ const deleteSelectedAnnotation = useCallback(() => {+ if (!selectedAnnotationId || !onAnnotationDelete || !onSelectAnnotation) return;+ onAnnotationDelete(selectedAnnotationId);+ onSelectAnnotation(null);+ }, [selectedAnnotationId, onAnnotationDelete, onSelectAnnotation]);+useEffect(() => {setRange(createInitialRange(totalMs));}, [totalMs]);@@ -495,12 +535,13 @@ export default function TimelineEditor({onTrimSpanChange?.(region.id, { start: normalizedStart, end: normalizedEnd });}});- }, [zoomRegions, trimRegions, totalMs, safeMinDurationMs, onZoomSpanChange, onTrimSpanChange]);+ }, [zoomRegions, trimRegions, annotationRegions, totalMs, safeMinDurationMs, onZoomSpanChange, onTrimSpanChange, onAnnotationSpanChange]);const hasOverlap = useCallback((newSpan: Span, excludeId?: string): boolean => {// Determine which row the item belongs toconst isZoomItem = zoomRegions.some(r => r.id === excludeId);const isTrimItem = trimRegions.some(r => r.id === excludeId);+ const isAnnotationItem = annotationRegions.some(r => r.id === excludeId);// Helper to check overlap against a specific set of regionsconst checkOverlap = (regions: (ZoomRegion | TrimRegion)[]) => {@@ -522,8 +563,12 @@ export default function TimelineEditor({if (isTrimItem) {return checkOverlap(trimRegions);}++ if (isAnnotationItem) {+ return checkOverlap(annotationRegions);+ }return false;- }, [zoomRegions, trimRegions]);+ }, [zoomRegions, trimRegions, annotationRegions]);const handleAddZoom = useCallback(() => {if (!videoDuration || videoDuration === 0 || totalMs === 0) {@@ -585,10 +630,35 @@ export default function TimelineEditor({onTrimAdded({ start: startPos, end: startPos + actualDuration });}, [videoDuration, totalMs, currentTimeMs, trimRegions, onTrimAdded]);- // Listen for F key to add keyframe, Z key to add zoom, T key to add trim, Ctrl+D to remove selected keyframe or zoom item+ const handleAddAnnotation = useCallback(() => {+ if (!videoDuration || videoDuration === 0 || totalMs === 0 || !onAnnotationAdded) {+ return;+ }++ const defaultDuration = Math.min(1000, totalMs);+ if (defaultDuration <= 0) {+ return;+ }++ const startPos = Math.max(0, Math.min(currentTimeMs, totalMs));+ const sorted = [...annotationRegions].sort((a, b) => a.startMs - b.startMs);+ const nextRegion = sorted.find(region => region.startMs > startPos);+ const gapToNext = nextRegion ? nextRegion.startMs - startPos : totalMs - startPos;++ const isOverlapping = sorted.some(region => startPos >= region.startMs && startPos < region.endMs);+ if (isOverlapping || gapToNext <= 0) {+ toast.error("Cannot place annotation here", {+ description: "Annotation already exists at this location or not enough space available.",+ });+ return;+ }++ const actualDuration = Math.min(1000, gapToNext);+ onAnnotationAdded({ start: startPos, end: startPos + actualDuration });+ }, [videoDuration, totalMs, currentTimeMs, annotationRegions, onAnnotationAdded]);+useEffect(() => {const handleKeyDown = (e: KeyboardEvent) => {- // Ignore if typing in an inputif (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {return;}@@ -602,6 +672,9 @@ export default function TimelineEditor({if (e.key === 't' || e.key === 'T') {handleAddTrim();}+ if (e.key === 'a' || e.key === 'A') {+ handleAddAnnotation();+ }if ((e.key === 'd' || e.key === 'D') && (e.ctrlKey || e.metaKey)) {if (selectedKeyframeId) {deleteSelectedKeyframe();@@ -609,12 +682,14 @@ export default function TimelineEditor({deleteSelectedZoom();} else if (selectedTrimId) {deleteSelectedTrim();+ } else if (selectedAnnotationId) {+ deleteSelectedAnnotation();}}};window.addEventListener('keydown', handleKeyDown);return () => window.removeEventListener('keydown', handleKeyDown);- }, [addKeyframe, handleAddZoom, handleAddTrim, deleteSelectedKeyframe, deleteSelectedZoom, deleteSelectedTrim, selectedKeyframeId, selectedZoomId, selectedTrimId]);+ }, [addKeyframe, handleAddZoom, handleAddTrim, handleAddAnnotation, deleteSelectedKeyframe, deleteSelectedZoom, deleteSelectedTrim, deleteSelectedAnnotation, selectedKeyframeId, selectedZoomId, selectedTrimId, selectedAnnotationId]);const clampedRange = useMemo<Range>(() => {if (totalMs === 0) {@@ -645,8 +720,16 @@ export default function TimelineEditor({variant: 'trim',}));- return [...zooms, ...trims];- }, [zoomRegions, trimRegions]);+ const annotations: TimelineRenderItem[] = annotationRegions.map((region, index) => ({+ id: region.id,+ rowId: ANNOTATION_ROW_ID,+ span: { start: region.startMs, end: region.endMs },+ label: `Note ${index + 1}`,+ variant: 'annotation',+ }));++ return [...zooms, ...trims, ...annotations];+ }, [zoomRegions, trimRegions, annotationRegions]);const handleItemSpanChange = useCallback((id: string, span: Span) => {// Check if it's a zoom or trim item@@ -654,8 +737,10 @@ export default function TimelineEditor({onZoomSpanChange(id, span);} else if (trimRegions.some(r => r.id === id)) {onTrimSpanChange?.(id, span);+ } else if (annotationRegions.some(r => r.id === id)) {+ onAnnotationSpanChange?.(id, span);}- }, [zoomRegions, trimRegions, onZoomSpanChange, onTrimSpanChange]);+ }, [zoomRegions, trimRegions, annotationRegions, onZoomSpanChange, onTrimSpanChange, onAnnotationSpanChange]);if (!videoDuration || videoDuration === 0) {return (@@ -693,6 +778,15 @@ export default function TimelineEditor({><Scissors className="w-4 h-4" /></Button>+ <Button+ onClick={handleAddAnnotation}+ variant="ghost"+ size="icon"+ className="h-7 w-7 text-slate-400 hover:text-[#B4A046] hover:bg-[#B4A046]/10 transition-all"+ title="Add Annotation (A)"+ >+ <MessageSquare className="w-4 h-4" />+ </Button></div><div className="flex items-center gap-2"><DropdownMenu>@@ -758,8 +852,10 @@ export default function TimelineEditor({onSeek={onSeek}onSelectZoom={onSelectZoom}onSelectTrim={onSelectTrim}+ onSelectAnnotation={onSelectAnnotation}selectedZoomId={selectedZoomId}selectedTrimId={selectedTrimId}+ selectedAnnotationId={selectedAnnotationId}/></TimelineWrapper></div>diff --git a/src/components/video-editor/types.ts b/src/components/video-editor/types.tsindex 273a4adf..3054d323 100644--- a/src/components/video-editor/types.ts+++ b/src/components/video-editor/types.ts@@ -19,11 +19,70 @@ export interface TrimRegion {endMs: number;}+export type AnnotationType = 'text' | 'image';++++export interface AnnotationPosition {+ x: number;+ y: number;+}++export interface AnnotationSize {+ width: number;+ height: number;+}++export interface AnnotationTextStyle {+ color: string;+ backgroundColor: string;+ fontSize: number; // pixels+ fontFamily: string;+ fontWeight: 'normal' | 'bold';+ fontStyle: 'normal' | 'italic';+ textDecoration: 'none' | 'underline';+ textAlign: 'left' | 'center' | 'right';+}++export interface AnnotationRegion {+ id: string;+ startMs: number;+ endMs: number;+ type: AnnotationType;+ content: string;+ position: AnnotationPosition;+ size: AnnotationSize;+ style: AnnotationTextStyle;+}++export const DEFAULT_ANNOTATION_POSITION: AnnotationPosition = {+ x: 50,+ y: 50,+};++export const DEFAULT_ANNOTATION_SIZE: AnnotationSize = {+ width: 30,+ height: 20,+};++export const DEFAULT_ANNOTATION_STYLE: AnnotationTextStyle = {+ color: '#ffffff',+ backgroundColor: 'transparent',+ fontSize: 32,+ fontFamily: 'Inter',+ fontWeight: 'bold',+ fontStyle: 'normal',+ textDecoration: 'none',+ textAlign: 'center',+};+++export interface CropRegion {- x: number; // 0-1 normalized- y: number; // 0-1 normalized- width: number; // 0-1 normalized- height: number; // 0-1 normalized+ x: number;+ y: number;+ width: number;+ height: number;}export const DEFAULT_CROP_REGION: CropRegion = {