From 414ee097a9c551c38add358e7990a1ccbced2e26 Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Wed, 19 Feb 2025 18:21:28 -0800 Subject: [PATCH] Add signal callback for shape buttons --- frontend/realtime/src/KonvaApp/Engine.ts | 15 ++++++++++----- .../KonvaRootComponent/SignaledToolbarMain.tsx | 6 ++++-- .../realtime/src/signals/uiEvents/addMedia.ts | 17 +++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/frontend/realtime/src/KonvaApp/Engine.ts b/frontend/realtime/src/KonvaApp/Engine.ts index d25ad93e8b..2114b570a3 100644 --- a/frontend/realtime/src/KonvaApp/Engine.ts +++ b/frontend/realtime/src/KonvaApp/Engine.ts @@ -359,7 +359,7 @@ export class Engine { // Listen to Toolbar Main uiEvents.toolbarMain.UNDO.onClick(() => this.undoStackManager.undo()); uiEvents.toolbarMain.REDO.onClick(() => this.undoStackManager.redo()); - + uiEvents.toolbarMain.SAVE.onClick(async (/*event*/) => { await this.realTimeDrawEngine.saveOutput(); @@ -393,7 +393,7 @@ export class Engine { this.addImage(image); }); - + uiEvents.onAddTextToEngine((textdata) => { this.addText(textdata); }); @@ -424,7 +424,7 @@ export class Engine { } } }); - + uiEvents.promptEvents.onPromptStrengthChanged((strength) => { this.realTimeDrawEngine.currentStrength = strength; }); @@ -432,6 +432,11 @@ export class Engine { uiEvents.promptEvents.onPromptTextChanged((prompt) => { this.realTimeDrawEngine.currentPrompt = prompt; }); + + uiEvents.onAddShapeToEngine((shapeData) => { + // TODO: Do something with shapes + console.log("Shape Data", shapeData); + }) } disableAllButtons() { @@ -467,7 +472,7 @@ export class Engine { } // Sandbox is quickly a way to test your idea. - public async sandbox() {} + public async sandbox() { } public onMessage(event: MessageEvent) { console.log("Message From Shared Worker"); @@ -579,7 +584,7 @@ export class Engine { if ( longestVideoNode === undefined || node.videoComponent.duration > - longestVideoNode.videoComponent.duration + longestVideoNode.videoComponent.duration ) { longestVideoNode = node; } diff --git a/frontend/realtime/src/KonvaRootComponent/SignaledToolbarMain.tsx b/frontend/realtime/src/KonvaRootComponent/SignaledToolbarMain.tsx index 16386ba37b..633687fcb7 100644 --- a/frontend/realtime/src/KonvaRootComponent/SignaledToolbarMain.tsx +++ b/frontend/realtime/src/KonvaRootComponent/SignaledToolbarMain.tsx @@ -12,6 +12,7 @@ import { LayoutSignalType } from "./contextSignals/layout"; import { AppUiContextInterface } from "./contextSignals/appUi"; import { twMerge } from "tailwind-merge"; import { paperWrapperStyles } from "~/components/styles"; +import { dispatchUiEvents } from "~/signals"; export const SignaledToolbarMain = ({ // layoutSignal, @@ -44,10 +45,11 @@ export const SignaledToolbarMain = ({ case ToolbarMainButtonNames.ADD_VIDEO: return () => appUiContext.openAddVideo(); case ToolbarMainButtonNames.ADD_CIRCLE: + return () => dispatchUiEvents.addShapeToEngine({ shape: "circle" }); case ToolbarMainButtonNames.ADD_TRIANGLE: + return () => dispatchUiEvents.addShapeToEngine({ shape: "triangle" }); case ToolbarMainButtonNames.ADD_SQUARE: - // TODO: Add shape? - return () => { }; + return () => dispatchUiEvents.addShapeToEngine({ shape: "square" }); default: return dispatchers[buttonName]; } diff --git a/frontend/realtime/src/signals/uiEvents/addMedia.ts b/frontend/realtime/src/signals/uiEvents/addMedia.ts index 1b1f29a8be..8b85ff5bff 100644 --- a/frontend/realtime/src/signals/uiEvents/addMedia.ts +++ b/frontend/realtime/src/signals/uiEvents/addMedia.ts @@ -48,15 +48,32 @@ const onAddTextToEngine = (callback: (data: TextNodeData) => void) => { }); }; +// Add shapes +// TODO: Remove this line and replace with actual shape data that engine needs +type ShapeNodeData = any; +const stagedShape = signal(null); +const addShapeToEngine = (data: ShapeNodeData) => { + stagedShape.value = data; +} +const onAddShapeToEngine = (callback: (data: ShapeNodeData) => void) => { + effect(() => { + if (stagedShape.value) { + callback(stagedShape.value); + } + }); +}; + //EXPORTS export const dispatchers = { addImageToEngine, addVideoToEngine, addTextToEngine, + addShapeToEngine, }; export const events = { onGetStagedImage, onGetStagedVideo, onAddTextToEngine, + onAddShapeToEngine, };