From 2677f9d4202334fa71bebf6d350c998b3d05e21a Mon Sep 17 00:00:00 2001
From: Delmer Reed <delmer814+1@gmail.com>
Date: Thu, 21 Jun 2018 09:35:12 -0400
Subject: [PATCH] Update expressions to display yield in script

Updates expressions to pass a yield node from the script to a
YieldFuncNode and allowing the correct yield name to be displayed in the
builder.
---
 ui/src/flux/components/ExpressionNode.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/flux/components/ExpressionNode.tsx b/ui/src/flux/components/ExpressionNode.tsx
index 9c5c0b25d..b065deae3 100644
--- a/ui/src/flux/components/ExpressionNode.tsx
+++ b/ui/src/flux/components/ExpressionNode.tsx
@@ -110,12 +110,18 @@ class ExpressionNode extends PureComponent<Props, State> {
                     isYieldable
                   )
 
+                  let yieldFunc = func
+
+                  if (this.isYieldNodeIndex(i + 1)) {
+                    yieldFunc = funcs[i + 1]
+                  }
+
                   return (
                     <Fragment key={`${i}-notInScript`}>
                       {funcNode}
                       <YieldFuncNode
                         index={i}
-                        func={func}
+                        func={yieldFunc}
                         data={data}
                         script={script}
                         bodyID={bodyID}