Skip to content

Create polished demo videos without editing skills. Mac/Windows/Linux

hex based inputs for brand consitency

Siddharth440f233a712b
diff --git a/dist-electron/main.js b/dist-electron/main.js
index e3039289..74485ec0 100644
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
@@ -2,8 +2,8 @@ import { ipcMain, screen, BrowserWindow, desktopCapturer, shell, app, dialog, na
import { fileURLToPath } from "node:url";
import path from "node:path";
import fs from "node:fs/promises";
-const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
-const APP_ROOT = path.join(__dirname$1, "..");
+const __dirname$2 = path.dirname(fileURLToPath(import.meta.url));
+const APP_ROOT = path.join(__dirname$2, "..");
const VITE_DEV_SERVER_URL$1 = process.env["VITE_DEV_SERVER_URL"];
const RENDERER_DIST$1 = path.join(APP_ROOT, "dist");
let hudOverlayWindow = null;
@@ -35,7 +35,7 @@ function createHudOverlayWindow() {
skipTaskbar: true,
hasShadow: false,
webPreferences: {
- preload: path.join(__dirname$1, "preload.mjs"),
+ preload: path.join(__dirname$2, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
backgroundThrottling: false
@@ -74,7 +74,7 @@ function createEditorWindow() {
title: "OpenScreen",
backgroundColor: "#000000",
webPreferences: {
- preload: path.join(__dirname$1, "preload.mjs"),
+ preload: path.join(__dirname$2, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true,
webSecurity: false,
@@ -109,7 +109,7 @@ function createSourceSelectorWindow() {
transparent: true,
backgroundColor: "#00000000",
webPreferences: {
- preload: path.join(__dirname$1, "preload.mjs"),
+ preload: path.join(__dirname$2, "preload.mjs"),
nodeIntegration: false,
contextIsolation: true
}
@@ -296,7 +296,7 @@ function registerIpcHandlers(createEditorWindow2, createSourceSelectorWindow2, g
return process.platform;
});
}
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
const RECORDINGS_DIR = path.join(app.getPath("userData"), "recordings");
async function ensureRecordingsDir() {
try {
@@ -307,7 +307,7 @@ async function ensureRecordingsDir() {
console.error("Failed to create recordings directory:", error);
}
}
-process.env.APP_ROOT = path.join(__dirname, "..");
+process.env.APP_ROOT = path.join(__dirname$1, "..");
const VITE_DEV_SERVER_URL = process.env["VITE_DEV_SERVER_URL"];
const MAIN_DIST = path.join(process.env.APP_ROOT, "dist-electron");
const RENDERER_DIST = path.join(process.env.APP_ROOT, "dist");
diff --git a/package.json b/package.json
index 1854ca25..219ffcfd 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-toggle-group": "^1.1.11",
"@uiw/color-convert": "^2.9.2",
+ "@uiw/react-color-block": "^2.9.2",
"@uiw/react-color-colorful": "^2.9.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e3aba06..749b8b2b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,12 @@ importers:
'@radix-ui/react-dropdown-menu':
specifier: ^2.1.16
+ '@radix-ui/react-popover':
+ specifier: ^1.1.15
+ '@radix-ui/react-select':
+ specifier: ^2.2.6
'@radix-ui/react-slider':
specifier: ^1.3.6
@@ -32,9 +38,18 @@ importers:
'@radix-ui/react-tabs':
specifier: ^1.1.13
+ '@radix-ui/react-toggle':
+ specifier: ^1.1.10
+ '@radix-ui/react-toggle-group':
+ specifier: ^1.1.11
'@uiw/color-convert':
specifier: ^2.9.2
version: 2.9.2(@babel/[email protected])
+ '@uiw/react-color-block':
+ specifier: ^2.9.2
'@uiw/react-color-colorful':
specifier: ^2.9.0
@@ -47,12 +62,24 @@ importers:
dnd-timeline:
specifier: ^2.2.0
+ emoji-picker-react:
+ specifier: ^4.16.1
+ version: 4.16.1([email protected])
+ fix-webm-duration:
+ specifier: ^1.0.6
+ version: 1.0.6
+ gsap:
+ specifier: ^3.13.0
+ version: 3.13.0
lucide-react:
specifier: ^0.545.0
version: 0.545.0([email protected])
mediabunny:
specifier: ^1.25.1
version: 1.25.1
+ motion:
+ specifier: ^12.23.24
mp4box:
specifier: ^2.2.0
version: 2.3.0
@@ -71,6 +98,9 @@ importers:
react-resizable-panels:
specifier: ^3.0.6
+ react-rnd:
+ specifier: ^10.5.2
sonner:
specifier: ^2.0.7
@@ -886,6 +916,19 @@ packages:
'@types/react-dom':
optional: true
+ '@radix-ui/[email protected]':
+ resolution: {integrity: sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==}
+ 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
+
'@radix-ui/[email protected]':
resolution: {integrity: sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==}
peerDependencies:
@@ -951,6 +994,19 @@ packages:
'@types/react-dom':
optional: true
+ '@radix-ui/[email protected]':
+ resolution: {integrity: sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==}
+ 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
+
'@radix-ui/[email protected]':
resolution: {integrity: sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==}
peerDependencies:
@@ -1008,6 +1064,32 @@ packages:
'@types/react-dom':
optional: true
+ '@radix-ui/[email protected]':
+ resolution: {integrity: sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==}
+ 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
+
+ '@radix-ui/[email protected]':
+ resolution: {integrity: sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==}
+ 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
+
'@radix-ui/[email protected]':
resolution: {integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==}
peerDependencies:
@@ -1080,6 +1162,19 @@ packages:
'@types/react':
optional: true
+ '@radix-ui/[email protected]':
+ resolution: {integrity: sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==}
+ 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
+
'@radix-ui/[email protected]':
resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
@@ -1364,6 +1459,13 @@ packages:
react: '>=16.9.0'
react-dom: '>=16.9.0'
+ resolution: {integrity: sha512-0EIZTELA5pnxyMlBOFo3hrpy73db+Qeq6E+QptNfD/8izor8OvY1Uquj2VqD6gDz+iVHMELIoKxpaQ8sZR7NOg==}
+ peerDependencies:
+ '@babel/runtime': '>=7.19.0'
+ react: '>=16.9.0'
+ react-dom: '>=16.9.0'
+
resolution: {integrity: sha512-tz/xeHayna2wpLipkZmcMgL1rmLMxfAmlOyBhUeWrpvqb9Fx59C/wL+5IYJA4rdsQvr9WyWjWmU/GhVKsEkW9w==}
peerDependencies:
@@ -1371,6 +1473,13 @@ packages:
react: '>=16.9.0'
react-dom: '>=16.9.0'
+ resolution: {integrity: sha512-DY7pu12+LDRn6cxDMvsy1/quaPTxicAPz/kfODV7KBf8+Hq4rFWeJ4KS6m22IKIbQxrBQgmQG0WFJLaPeY7cPw==}
+ peerDependencies:
+ '@babel/runtime': '>=7.19.0'
+ react: '>=16.9.0'
+ react-dom: '>=16.9.0'
+
resolution: {integrity: sha512-vDGN5YCzw09BfxkQeDvAeQ7zAy141uJ3HkFk1lsXL7ha8xZ35AItE1s/C6d60vFjGdoloKShh0yA7df3pnjmxA==}
peerDependencies:
@@ -1385,6 +1494,13 @@ packages:
react: '>=16.9.0'
react-dom: '>=16.9.0'
+ resolution: {integrity: sha512-6zBy+E9NzZR672M2wPsbbNRqKy9Wi9jOuuxxyzov1CEZp+pPX7UwMlCX6RUhKdO0PzTSPCVQmbz5bplu5vsW0w==}
+ peerDependencies:
+ '@babel/runtime': '>=7.19.0'
+ react: '>=16.9.0'
+ react-dom: '>=16.9.0'
+
resolution: {integrity: sha512-6gxQz+Ij7JkXlEOpfZhOu+Gdp/sI9VnMeDl8AJeYl3+0YXP31lXGmyb0NkNYnoUmJO+RrAf68c1raMpaDWs+Ow==}
peerDependencies:
@@ -1741,6 +1857,10 @@ packages:
resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
engines: {node: '>=0.8'}
+ resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
engines: {node: '>=6'}
@@ -1997,6 +2117,12 @@ packages:
engines: {node: '>= 12.20.55'}
hasBin: true
+ resolution: {integrity: sha512-MrPX0tOCfRL3uYI4of/2GRZ7S6qS7YlacKiF78uFH84/C62vcuHE2DZyv5b4ZJMk0e06es1jjB4e31Bb+YSM8w==}
+ engines: {node: '>=10'}
+ peerDependencies:
+ react: '>=16'
+
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -2198,6 +2324,12 @@ packages:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
+ resolution: {integrity: sha512-zVAqi4gE+8ywxJuAyV/rlJVX6CMtvyapEbQx6jyoeX9TMjdqAlt/FdG5d7rXSSkDVzTvS0H7CtwzHcH/vh4FPA==}
+
+ resolution: {integrity: sha512-IKlE+pNvL2R+kVL1kEhUYqRxVqeFnjiIvHWDMLFXNaqyUdFXQM2wte44EfMYJNHkW16X991t2Zg8apKkhv7OBA==}
+
resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==}
engines: {node: ^10.12.0 || >=12.0.0}
@@ -2232,6 +2364,20 @@ packages:
resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
+ resolution: {integrity: sha512-gUHGl2e4VG66jOcH0JHhuJQr6ZNwrET9g31ZG0xdXzT0CznP7fHX4P8Bcvuc4MiUB90ysNnWX2ukHRIggkl6hQ==}
+ 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
+
resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
@@ -2360,6 +2506,9 @@ packages:
resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+ resolution: {integrity: sha512-QL7MJ2WMjm1PHWsoFrAQH/J8wUeqZvMtHO58qdekHpCfhvhSL4gSiz6vJf5EeMP0LOn3ZCprL2ki/gjED8ghVw==}
+
resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
engines: {node: '>=4'}
@@ -2856,6 +3005,26 @@ packages:
engines: {node: '>=10'}
hasBin: true
+ resolution: {integrity: sha512-n5yolOs0TQQBRUFImrRfs/+6X4p3Q4n1dUEqt/H58Vx7OW6RF+foWEgmTVDhIWJIMXOuNNL0apKH2S16en9eiA==}
+
+ resolution: {integrity: sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==}
+
+ resolution: {integrity: sha512-Fk5Y1kcgxYiTYOUjmwfXQAP7tP+iGqw/on1UID9WEL/6KpzxPr9jY2169OsjgZvXJdpraKXy0orkjaCVIl5fgQ==}
+ 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
+
resolution: {integrity: sha512-nnABYbdh4UguEYyV+uRwQBi1tbb8kXka2Fx9yKzmDKAeh8gkvRKYxoK1XDd8GQIjSfN4rvsXrW1CBo4yRQJZDA==}
engines: {node: '>=20.8.1'}
@@ -3207,6 +3376,9 @@ packages:
resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
engines: {node: '>=10'}
+ resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
@@ -3235,16 +3407,31 @@ packages:
resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
engines: {node: '>=10'}
+ resolution: {integrity: sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==}
+ 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
+
resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
peerDependencies:
react: ^18.3.1
+ resolution: {integrity: sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==}
+ peerDependencies:
+ react: '>= 16.3.0'
+ react-dom: '>= 16.3.0'
+
resolution: {integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==}
peerDependencies:
react: '*'
+ resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==}
engines: {node: '>=0.10.0'}
@@ -3275,6 +3462,12 @@ packages:
react: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+ resolution: {integrity: sha512-0Tm4x7k7pfHf2snewJA8x7Nwgt3LV+58MVEWOVsFjk51eYruFEa6Wy7BNdxt4/lH0wIRsu7Gm3KjSXY2w7YaNw==}
+ peerDependencies:
+ react: '>=16.3.0'
+ react-dom: '>=16.3.0'
+
resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
engines: {node: '>=10'}
@@ -3686,6 +3879,9 @@ packages:
resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
+ resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
@@ -4791,6 +4987,29 @@ snapshots:
'@types/react': 18.3.27
'@types/react-dom': 18.3.7(@types/[email protected])
+ dependencies:
+ '@radix-ui/primitive': 1.1.3
+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-guards': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
+ aria-hidden: 1.2.6
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ react-remove-scroll: 2.7.1(@types/[email protected])([email protected])
+ optionalDependencies:
+ '@types/react': 18.3.27
+ '@types/react-dom': 18.3.7(@types/[email protected])
+
dependencies:
'@floating-ui/react-dom': 2.1.6([email protected]([email protected]))([email protected])
@@ -4855,6 +5074,35 @@ snapshots:
'@types/react': 18.3.27
'@types/react-dom': 18.3.7(@types/[email protected])
+ dependencies:
+ '@radix-ui/number': 1.1.1
+ '@radix-ui/primitive': 1.1.3
+ '@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-focus-guards': 1.1.3(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-slot': 1.2.3(@types/[email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-previous': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-visually-hidden': 1.2.3(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ aria-hidden: 1.2.6
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ react-remove-scroll: 2.7.1(@types/[email protected])([email protected])
+ optionalDependencies:
+ '@types/react': 18.3.27
+ '@types/react-dom': 18.3.7(@types/[email protected])
+
dependencies:
'@radix-ui/number': 1.1.1
@@ -4919,6 +5167,32 @@ snapshots:
'@types/react': 18.3.27
'@types/react-dom': 18.3.7(@types/[email protected])
+ dependencies:
+ '@radix-ui/primitive': 1.1.3
+ '@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
+ '@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.1.11(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ optionalDependencies:
+ '@types/react': 18.3.27
+ '@types/react-dom': 18.3.7(@types/[email protected])
+
+ dependencies:
+ '@radix-ui/primitive': 1.1.3
+ '@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ optionalDependencies:
+ '@types/react': 18.3.27
+ '@types/react-dom': 18.3.7(@types/[email protected])
+
dependencies:
react: 18.3.1
@@ -4973,6 +5247,15 @@ snapshots:
optionalDependencies:
'@types/react': 18.3.27
+ dependencies:
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ optionalDependencies:
+ '@types/react': 18.3.27
+ '@types/react-dom': 18.3.7(@types/[email protected])
+
'@radix-ui/[email protected]': {}
'@rolldown/[email protected]': {}
@@ -5245,6 +5528,15 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
+ dependencies:
+ '@babel/runtime': 7.28.4
+ '@uiw/color-convert': 2.9.2(@babel/[email protected])
+ '@uiw/react-color-editable-input': 2.9.2(@babel/[email protected])([email protected]([email protected]))([email protected])
+ '@uiw/react-color-swatch': 2.9.2(@babel/[email protected])([email protected]([email protected]))([email protected])
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
dependencies:
'@babel/runtime': 7.28.4
@@ -5255,6 +5547,12 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
+ dependencies:
+ '@babel/runtime': 7.28.4
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
dependencies:
'@babel/runtime': 7.28.4
@@ -5271,6 +5569,13 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
+ dependencies:
+ '@babel/runtime': 7.28.4
+ '@uiw/color-convert': 2.9.2(@babel/[email protected])
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
dependencies:
'@babel/runtime': 7.28.4
@@ -5709,6 +6014,8 @@ snapshots:
+
@@ -6011,6 +6318,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ dependencies:
+ flairup: 1.0.0
+ react: 18.3.1
+
@@ -6254,6 +6566,10 @@ snapshots:
locate-path: 6.0.0
path-exists: 4.0.0
+
+
dependencies:
flatted: 3.3.3
@@ -6287,6 +6603,15 @@ snapshots:
+ dependencies:
+ motion-dom: 12.23.23
+ motion-utils: 12.23.6
+ tslib: 2.8.1
+ optionalDependencies:
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
@@ -6467,6 +6792,8 @@ snapshots:
+
@@ -6939,6 +7266,20 @@ snapshots:
+ dependencies:
+ motion-utils: 12.23.6
+
+
+ dependencies:
+ tslib: 2.8.1
+ optionalDependencies:
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
@@ -7257,6 +7598,12 @@ snapshots:
err-code: 2.0.3
retry: 0.12.0
+ dependencies:
+ loose-envify: 1.4.0
+ object-assign: 4.1.1
+ react-is: 16.13.1
+
dependencies:
punycode: 2.3.1
@@ -7280,16 +7627,30 @@ snapshots:
+ dependencies:
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
dependencies:
loose-envify: 1.4.0
react: 18.3.1
scheduler: 0.23.2
+ dependencies:
+ clsx: 1.2.1
+ prop-types: 15.8.1
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+
dependencies:
react: 18.3.1
+
@@ -7316,6 +7677,14 @@ snapshots:
react: 18.3.1
react-dom: 18.3.1([email protected])
+ dependencies:
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ tslib: 2.6.2
+
dependencies:
get-nonce: 1.0.1
@@ -7839,6 +8208,8 @@ snapshots:
+
diff --git a/src/components/video-editor/AnnotationSettingsPanel.tsx b/src/components/video-editor/AnnotationSettingsPanel.tsx
index 9d11bcb4..3fe6e9fd 100644
--- a/src/components/video-editor/AnnotationSettingsPanel.tsx
+++ b/src/components/video-editor/AnnotationSettingsPanel.tsx
@@ -3,8 +3,7 @@ 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, Info } from "lucide-react";
import { toast } from "sonner";
-import Colorful from '@uiw/react-color-colorful';
-import { hsvaToHex, hexToHsva } from '@uiw/color-convert';
+import Block from '@uiw/react-color-block';
import type { AnnotationRegion, AnnotationType, ArrowDirection, FigureData } from "./types";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
@@ -44,11 +43,24 @@ export function AnnotationSettingsPanel({
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 [figureColorHsva, setFigureColorHsva] = useState(
- hexToHsva(annotation.figureData?.color || '#34B27B')
- );
+ const colorPalette = [
+ '#FF0000', // Red
+ '#FFD700', // Yellow/Gold
+ '#00FF00', // Green
+ '#FFFFFF', // White
+ '#0000FF', // Blue
+ '#FF6B00', // Orange
+ '#9B59B6', // Purple
+ '#E91E63', // Pink
+ '#00BCD4', // Cyan
+ '#FF5722', // Deep Orange
+ '#8BC34A', // Light Green
+ '#FFC107', // Amber
+ '#34B27B', // Brand Green
+ '#000000', // Black
+ '#607D8B', // Blue Grey
+ '#795548', // Brown
+ ];
@@ -252,18 +264,17 @@ export function AnnotationSettingsPanel({
<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 className="w-[260px] p-3 bg-[#1a1a1c] border border-white/10 rounded-xl shadow-xl">
+ <Block
+ color={annotation.style.color}
+ colors={colorPalette}
+ onChange={(color) => {
+ onStyleChange({ color: color.hex });
+ }}
+ style={{
+ borderRadius: '8px',
+ }}
+ />
</PopoverContent>
</Popover>
</div>
@@ -290,28 +301,27 @@ export function AnnotationSettingsPanel({
<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 className="w-[260px] p-3 bg-[#1a1a1c] border border-white/10 rounded-xl shadow-xl">
+ <Block
+ color={annotation.style.backgroundColor === 'transparent' ? '#000000' : annotation.style.backgroundColor}
+ colors={colorPalette}
+ onChange={(color) => {
+ onStyleChange({ backgroundColor: color.hex });
+ }}
+ style={{
+ 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' });
+ }}
+ >
+ Clear Background
+ </Button>
</PopoverContent>
</Popover>
</div>
@@ -428,22 +438,21 @@ export function AnnotationSettingsPanel({
<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={figureColorHsva}
- disableAlpha={true}
- onChange={(color) => {
- setFigureColorHsva(color.hsva);
- const newFigureData: FigureData = {
- ...annotation.figureData!,
- color: hsvaToHex(color.hsva),
- };
- onFigureDataChange?.(newFigureData);
- }}
- style={{ width: '100%', borderRadius: '8px' }}
- />
- </div>
+ <PopoverContent className="w-[260px] p-3 bg-[#1a1a1c] border border-white/10 rounded-xl shadow-xl">
+ <Block
+ color={annotation.figureData?.color || '#34B27B'}
+ colors={colorPalette}
+ onChange={(color) => {
+ const newFigureData: FigureData = {
+ ...annotation.figureData!,
+ color: color.hex,
+ };
+ onFigureDataChange?.(newFigureData);
+ }}
+ style={{
+ borderRadius: '8px',
+ }}
+ />
</PopoverContent>
</Popover>
</div>
diff --git a/src/components/video-editor/SettingsPanel.tsx b/src/components/video-editor/SettingsPanel.tsx
index fd48976c..62fa8b5a 100644
--- a/src/components/video-editor/SettingsPanel.tsx
+++ b/src/components/video-editor/SettingsPanel.tsx
@@ -6,8 +6,7 @@ import { Switch } from "@/components/ui/switch";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { Button } from "@/components/ui/button";
import { useState } from "react";
-import Colorful from '@uiw/react-color-colorful';
-import { hsvaToHex } from '@uiw/color-convert';
+import Block from '@uiw/react-color-block';
import { Trash2, Download, Crop, X, Bug, Upload } from "lucide-react";
import { GiHearts } from "react-icons/gi";
import { toast } from "sonner";
@@ -143,7 +142,13 @@ export function SettingsPanel({
})()
return () => { mounted = false }
}, [])
- const [hsva, setHsva] = useState({ h: 0, s: 0, v: 68, a: 1 });
+ const colorPalette = [
+ '#FF0000', '#FFD700', '#00FF00', '#FFFFFF', '#0000FF', '#FF6B00',
+ '#9B59B6', '#E91E63', '#00BCD4', '#FF5722', '#8BC34A', '#FFC107',
+ '#34B27B', '#000000', '#607D8B', '#795548',
+ ];
+
+ const [selectedColor, setSelectedColor] = useState('#ADADAD');
const [gradient, setGradient] = useState<string>(GRADIENTS[0]);
const [showCropDropdown, setShowCropDropdown] = useState(false);
@@ -508,14 +513,17 @@ export function SettingsPanel({
<TabsContent value="color" className="mt-0 px-2">
<div className="p-1">
- <Colorful
- color={hsva}
- disableAlpha={true}
+ <Block
+ color={selectedColor}
+ colors={colorPalette}
onChange={(color) => {
- setHsva(color.hsva);
- onWallpaperChange(hsvaToHex(color.hsva));
+ setSelectedColor(color.hex);
+ onWallpaperChange(color.hex);
+ }}
+ style={{
+ width: '100%',
+ borderRadius: '12px',
}}
- style={{ width: '100%', borderRadius: '12px' }}
/>
</div>
</TabsContent>