diff --git a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx index 9bd85a2397..3801bc19ed 100644 --- a/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageDraw/PageDraw.tsx @@ -16,7 +16,7 @@ import Konva from 'konva'; import { setCanvasRenderBitmap } from "../../signals/canvasRenderBitmap" import { captureStageImageBitmap } from "./hooks/useUpdateSnapshot" -import { useStateSceneLoader } from "./hooks/useStateSceneLoader"; +import { ContextMenuContainer } from "./components/ui/ContextMenu"; const PageDraw = () => { //useStateSceneLoader(); @@ -142,10 +142,11 @@ const PageDraw = () => { store.createTriangle(centerX, centerY); } }} - onPaintBrush={(hex: string, size: number): void => { + onPaintBrush={(hex: string, size: number, opacity: number): void => { store.setActiveTool("draw"); store.setBrushColor(hex); store.setBrushSize(size); + store.setBrushOpacity(opacity); }} onEraser={(size: number): void => { store.setActiveTool("eraser"); @@ -209,6 +210,7 @@ const PageDraw = () => { activeToolId={store.activeTool} />
+ { stageRef={stageRef} transformerRefs={transformerRefs} /> +
void; + divider?: boolean; +} + +interface ContextMenuProps { + items: MenuItem[]; + onClose: () => void; + position: MenuPosition; +} + +export const ContextMenu: React.FC = ({ items, onClose, position }) => { + const menuRef = useRef(null); + + useEffect(() => { + const handleClickOutside = (event: MouseEvent) => { + if (menuRef.current && !menuRef.current.contains(event.target as Node)) { + onClose(); + } + }; + + document.addEventListener('mousedown', handleClickOutside); + return () => document.removeEventListener('mousedown', handleClickOutside); + }, [onClose]); + + return ( +
+ {items.map((item, index) => ( + + + {item.divider &&
} + + ))} +
+ ); +}; + +// Example usage with icons +const menuItems: MenuItem[] = [ + { + icon: + + + + , + label: 'Convert to 3D', + onClick: () => console.log('Convert to 3D') + }, + { + icon: + + , + label: 'Remove background', + onClick: () => console.log('Remove background') + }, + { + icon: + + , + label: 'Lock', + onClick: () => console.log('Lock'), + divider: true + }, + { + icon: + + , + label: 'Bring to front', + onClick: () => console.log('Bring to front') + }, + { + icon: + + , + label: 'Bring forward', + onClick: () => console.log('Bring forward') + }, + { + icon: + + , + label: 'Send backward', + onClick: () => console.log('Send backward') + }, + { + icon: + + , + label: 'Send to back', + onClick: () => console.log('Send to back'), + divider: true + }, + { + icon: + + , + label: 'Duplicate', + onClick: () => console.log('Duplicate') + }, + { + icon: + + , + label: 'Flip Horizontal', + onClick: () => console.log('Flip Horizontal') + }, + { + icon: + + , + label: 'Flip Vertical', + onClick: () => console.log('Flip Vertical') + }, + { + icon: + + + , + label: 'Fit to screen', + onClick: () => console.log('Fit to screen') + } +]; + +// Container component that handles the right-click +export const ContextMenuContainer: React.FC<{ children: React.ReactNode }> = ({ children }) => { + const [showMenu, setShowMenu] = React.useState(false); + const [position, setPosition] = React.useState({ x: 0, y: 0 }); + + const handleContextMenu = (e: React.MouseEvent) => { + e.preventDefault(); + setPosition({ x: e.clientX, y: e.clientY }); + setShowMenu(true); + }; + + return ( +
+ {children} + {showMenu && ( + setShowMenu(false)} + /> + )} +
+ ); +}; diff --git a/frontend/apps/editor3d/app/src/pages/PageDraw/components/ui/SideToolbar.tsx b/frontend/apps/editor3d/app/src/pages/PageDraw/components/ui/SideToolbar.tsx index 632b075526..0ae3f6b1ce 100644 --- a/frontend/apps/editor3d/app/src/pages/PageDraw/components/ui/SideToolbar.tsx +++ b/frontend/apps/editor3d/app/src/pages/PageDraw/components/ui/SideToolbar.tsx @@ -13,6 +13,8 @@ import { faSparkles, faFileImport, faFileExport, + faUndo, + faRedo } from "@fortawesome/pro-solid-svg-icons"; import "../../App.css"; import { HsvaColorPicker, HsvaColor } from "react-colorful"; @@ -40,7 +42,7 @@ function useDebounced void, A extends unknown[]>( export interface SideToolbarProps { onSelect: () => void; onAddShape: (shape: "rectangle" | "circle" | "triangle") => void; - onPaintBrush: (hex: string, size: number) => void; + onPaintBrush: (hex: string, size: number,opacity: number) => void; onEraser: (size: number) => void; onCanvasBackground: (hex: string) => void; onGenerateImage: () => void; @@ -72,6 +74,7 @@ const SideToolbar: React.FC = ({ v: 100, a: 1, }); + const [bgHsva, setBgHsva] = useState({ h: 0, s: 100, @@ -81,9 +84,11 @@ const SideToolbar: React.FC = ({ /* debounced parent calls */ const sendPaint = useDebounced< - (hex: string, size: number) => void, - [string, number] - >(onPaintBrush, 75); + (hex: string, size: number, opacity: number) => void, + [string, number, number] + >(onPaintBrush, 75, 1); + + const sendBg = useDebounced<(hex: string) => void, [string]>( onCanvasBackground, 75, @@ -117,7 +122,8 @@ const SideToolbar: React.FC = ({ const BrushPopout = makePicker( brushHsva, setBrushHsva, - (hex) => sendPaint(hex, brushSize), + (hex) => sendPaint(hex, brushSize, brushHsva.a), + <>

Brush Size

@@ -125,7 +131,7 @@ const SideToolbar: React.FC = ({ value={brushSize} onChange={(size) => { setBrushSize(size); - sendPaint(hsvaToHex(brushHsva), size); + sendPaint(hsvaToHex(brushHsva), size, brushHsva.a); }} min={1} max={64} @@ -179,14 +185,14 @@ const SideToolbar: React.FC = ({
), }, - { - id: "generate", - label: "Generate Image", - icon: , - onClick: () => { - onGenerateImage(); - }, - }, + // { + // id: "generate", + // label: "Generate Image", + // icon: , + // onClick: () => { + // onGenerateImage(); + // }, + // }, { id: "upload", label: "Upload Image", @@ -206,7 +212,7 @@ const SideToolbar: React.FC = ({ /> ), onClick: () => { - sendPaint(hsvaToHex(brushHsva), brushSize); + sendPaint(hsvaToHex(brushHsva), brushSize, brushHsva.a); }, popout: BrushPopout, }, @@ -251,35 +257,51 @@ const SideToolbar: React.FC = ({ popout: BgPopout, }, { - id: "save-scene", - label: "Save Scene", - icon: , + id: "undo", + label: "Undo", + icon: , onClick: () => { - store.saveSceneToFile(); + store.undo(); // Assuming store has an undo method }, }, { - id: "load-scene", - label: "Load Scene", - icon: , + id: "redo", + label: "Redo", + icon: , onClick: () => { - const input = document.createElement("input"); - input.type = "file"; - input.accept = ".json"; - input.onchange = async (e: Event) => { - const target = e.target as HTMLInputElement; - if (target.files && target.files[0]) { - const success = await store.loadSceneFromFile(target.files[0]); - if (success) { - console.log("Scene loaded successfully"); - } else { - console.error("Failed to load scene"); - } - } - }; - input.click(); + store.redo(); // Assuming store has a redo method }, }, + // { + // id: "save-scene", + // label: "Save Scene", + // icon: , + // onClick: () => { + // store.saveSceneToFile(); + // }, + // }, + // { + // id: "load-scene", + // label: "Load Scene", + // icon: , + // onClick: () => { + // const input = document.createElement("input"); + // input.type = "file"; + // input.accept = ".json"; + // input.onchange = async (e: Event) => { + // const target = e.target as HTMLInputElement; + // if (target.files && target.files[0]) { + // const success = await store.loadSceneFromFile(target.files[0]); + // if (success) { + // console.log("Scene loaded successfully"); + // } else { + // console.error("Failed to load scene"); + // } + // } + // }; + // input.click(); + // }, + // }, ]; /* ------------------------------------------------ render ---------- */ diff --git a/frontend/apps/editor3d/app/src/pages/PageDraw/stores/SceneState.ts b/frontend/apps/editor3d/app/src/pages/PageDraw/stores/SceneState.ts index af5a6c15f6..221a56a01c 100644 --- a/frontend/apps/editor3d/app/src/pages/PageDraw/stores/SceneState.ts +++ b/frontend/apps/editor3d/app/src/pages/PageDraw/stores/SceneState.ts @@ -9,6 +9,7 @@ export type LineNode = { stroke: string; strokeWidth: number; draggable: boolean; + opacity?: number; // Add opacity property x?: number; y?: number; rotation?: number; @@ -33,6 +34,7 @@ interface SceneState { activeTool: ActiveTool; brushColor: string; brushSize: number; + brushOpacity: number; fillColor: string; // Cursor state @@ -84,6 +86,7 @@ interface SceneState { // Toolbar actions setActiveTool: (tool: ActiveTool) => void; setBrushColor: (color: string) => void; + setBrushOpacity: (opacity: number) => void; setBrushSize: (size: number) => void; setFillColor: (color: string) => void; @@ -122,6 +125,7 @@ export const useSceneStore = create((set, get) => ({ activeTool: 'select', brushColor: '#000000', brushSize: 5, + brushOpacity: 1, fillColor: 'white', // Cursor initial state @@ -719,6 +723,7 @@ export const useSceneStore = create((set, get) => ({ setBrushColor: (color: string) => set({ brushColor: color }), setBrushSize: (size: number) => set({ brushSize: size }), setFillColor: (color: string) => set({ fillColor: color }), + setBrushOpacity: (opacity: number) => set({ brushOpacity: opacity }), // Cursor actions setCursorPosition: (position: { x: number; y: number } | null) => set({ cursorPosition: position }),