Merge pull request #267 from tokens-studio/fix-subgraph-output

fix(1013): Subgraph output
tokens-studio · Jun 12, 2024 · 719b4ba · 719b4ba
2 parents 6d4613b + 1671ea6
commit 719b4ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/graph-editor/src/components/flow/wrapper/nodeV2.tsx b/packages/graph-editor/src/components/flow/wrapper/nodeV2.tsx
@@ -15,7 +15,7 @@ import { useLocalGraph } from '@/context/graph.js';
 
 const isHexColor = (str) => {
   if (typeof str !== 'string') return false;
-  return /^#(?:[0-9a-fA-F]{3}){1,2}$/.test(str);;
+  return /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.test(str);;
 };
 
 export type UiNodeDefinition = {
@@ -156,7 +156,7 @@ const getColorPreview = (color: string, showValue = false) => {
   return (
     <Stack direction="row" gap={2}>
       {colorSwatch}    
-      {showValue ? <Text css={{ fontSize: '$small', color: '$gray12' }}>{color}</Text> : null}
+      {showValue ? <Text css={{ fontSize: '$small', color: '$gray12' }}>{color.toUpperCase()}</Text> : null}
     </Stack>
   );
 }

diff --git a/packages/graph-engine/src/nodes/generic/subgraph.ts b/packages/graph-engine/src/nodes/generic/subgraph.ts
@@ -39,6 +39,11 @@ export default class SubgraphNode extends Node {
     this._innerGraph.addNode(input);
     this._innerGraph.addNode(output);
 
+    this.addOutput("value", {
+      type: AnySchema,
+      visible: true,
+    });
+
     autorun(() => {
 
       //Get the existing inputs 
@@ -94,11 +99,10 @@ export default class SubgraphNode extends Node {
       return acc;
     }, {});
 
-
     const result = await this._innerGraph.execute({
       inputs
     });
 
-    this.setOutput("value", result.output?.value, result.output?.type);
+    this.setOutput("value", result.output?.value.value, result.output?.value.type);
   }
 }