diff --git a/frontend/realtime/src/KonvaApp/NodesManagers/ToolbarNodeUtilities.ts b/frontend/realtime/src/KonvaApp/NodesManagers/ToolbarNodeUtilities.ts
index 9b82c82d5d..8e09c585be 100644
--- a/frontend/realtime/src/KonvaApp/NodesManagers/ToolbarNodeUtilities.ts
+++ b/frontend/realtime/src/KonvaApp/NodesManagers/ToolbarNodeUtilities.ts
@@ -152,6 +152,50 @@ export function getVideoNodeButtonStates(
{} as ContextualToolbarProps["buttonStates"],
);
}
+
+export function getShapeNodeButtonStates(
+ props: { locked?: boolean | "unknown" } = {},
+) {
+ const ButtonNames = ToolbarNodeButtonNames;
+ return Object.values(ButtonNames).reduce(
+ (buttonStates, buttonName) => {
+ // transform button depends on locked state
+ if (props.locked !== undefined && buttonName === ButtonNames.TRANSFORM) {
+ buttonStates.TRANSFORM = {
+ disabled: props.locked === "unknown" || props.locked === true,
+ hidden: false,
+ active: true,
+ };
+ return buttonStates;
+ }
+
+ // hidden buttons
+ if (
+ buttonName === ButtonNames.AI_STYLIZE ||
+ buttonName === ButtonNames.SEGMENTATION ||
+ buttonName === ButtonNames.DOWNLOAD ||
+ buttonName === ButtonNames.CHROMA
+ ) {
+ buttonStates[buttonName] = {
+ disabled: true,
+ hidden: true,
+ active: false,
+ };
+ return buttonStates;
+ }
+
+ // all other buttons
+ buttonStates[buttonName] = {
+ disabled: false,
+ hidden: false,
+ active: false,
+ };
+ return buttonStates;
+ },
+ {} as ContextualToolbarProps["buttonStates"],
+ );
+}
+
export function getMultiSelectButtonStates(
props: { locked?: boolean | "unknown" } = {},
) {
diff --git a/frontend/realtime/src/KonvaApp/types/NodeData.ts b/frontend/realtime/src/KonvaApp/types/NodeData.ts
index dae440e821..fb220c43d1 100644
--- a/frontend/realtime/src/KonvaApp/types/NodeData.ts
+++ b/frontend/realtime/src/KonvaApp/types/NodeData.ts
@@ -26,6 +26,10 @@ export type VideoNodeData = {
extractionUrl?: string;
};
+export type ShapeNodeData = {
+ shape: "triangle" | "square" | "circle";
+}
+
export type NodeData = {
type: NodeType;
transform: TransformationData;
diff --git a/frontend/realtime/src/KonvaRootComponent/ContextualToolbarNode.tsx b/frontend/realtime/src/KonvaRootComponent/ContextualToolbarNode.tsx
index 16d32a0c0d..e02482ba7c 100644
--- a/frontend/realtime/src/KonvaRootComponent/ContextualToolbarNode.tsx
+++ b/frontend/realtime/src/KonvaRootComponent/ContextualToolbarNode.tsx
@@ -50,6 +50,20 @@ export const ContextualToolbarNode = () => {
};
}, []);
+ const handleColorChange = (color: string) => {
+ // Don't do anything if no node is known to be bound
+ if (uiAccess.toolbarNode.signal.value.knodeIds.length < 1) {
+ return;
+ }
+
+ // Update the UI component
+ uiAccess.toolbarNode.setColor(color);
+
+ // Signal the engine with the node ID (just grab the first -and expected only- node)
+ const nodeID = uiAccess.toolbarNode.signal.value.knodeIds[0];
+ dispatchUiEvents.toolbarNode.setSelectedColor({ kNodeId: nodeID, color });
+ }
+
const boundedTopPosition = Math.min(position.y, winSize.height - 164);
return (
{
dispatchUiEvents.toolbarNode.lock(e);
}}
color={uiAccess.toolbarNode.signal.value.color}
- onColorChange={(color) => { uiAccess.toolbarNode.setColor(color) }}
+ onColorChange={handleColorChange}
/>
);
diff --git a/frontend/realtime/src/signals/uiEvents/addMedia.ts b/frontend/realtime/src/signals/uiEvents/addMedia.ts
index c546061025..25954e9fcd 100644
--- a/frontend/realtime/src/signals/uiEvents/addMedia.ts
+++ b/frontend/realtime/src/signals/uiEvents/addMedia.ts
@@ -1,5 +1,5 @@
import { signal, effect } from "@preact/signals-react";
-import { TextNodeData } from "~/KonvaApp/types";
+import { ShapeNodeData, TextNodeData } from "~/KonvaApp/types";
// ADDING IMAGES
const stagedImage = signal(null);
@@ -50,8 +50,6 @@ 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;
diff --git a/frontend/realtime/src/signals/uiEvents/toolbarNode.ts b/frontend/realtime/src/signals/uiEvents/toolbarNode.ts
index 35c6f02219..cabe547a2d 100644
--- a/frontend/realtime/src/signals/uiEvents/toolbarNode.ts
+++ b/frontend/realtime/src/signals/uiEvents/toolbarNode.ts
@@ -44,6 +44,11 @@ const buttonEventsRecords = Object.values(ButtonNames).reduce(
const buttonEventsHandlers = Object.values(ButtonNames).reduce(
(acc, buttonName) => {
+ // We define custom events/handlers for color changes
+ if (buttonName === ButtonNames.COLOR) {
+ return acc;
+ }
+
acc[buttonName] = {
onClick: (callback: MouseEventHandler) => {
const { eventSignal, effectCleanup, lastEventTimestamp } =
@@ -111,9 +116,27 @@ const retryEventHandler = (callback: MouseEventHandler) => {
const retryDispatcher = (e: React.MouseEvent) => {
retryEvent.value = e;
};
+
+export type NodeColor = {
+ kNodeId: string;
+ color: string;
+}
+const selectedColorEvent = signal();
+const setSelectedColor = (nodeColor: NodeColor) => {
+ selectedColorEvent.value = nodeColor;
+}
+const onSelectedColorChanged = (callback: (color: NodeColor) => void) => {
+ effect(() => {
+ if (selectedColorEvent.value) {
+ callback(selectedColorEvent.value);
+ }
+ });
+};
+
export const dispatchers = {
lock: lockDispatcher,
retry: retryDispatcher,
+ setSelectedColor,
...buttonDispatchers,
};
export const eventsHandlers = {
@@ -123,5 +146,8 @@ export const eventsHandlers = {
retry: {
onClick: retryEventHandler,
},
+ color: {
+ onConfirmChanged: onSelectedColorChanged,
+ },
...buttonEventsHandlers,
};