fix(weave): Ensure newVars are passed in when expanding a panel op (#…

…3059)

weave-js/src/components/Panel2/PanelExpression/hooks.ts

@@ -35,8 +35,7 @@ import {
 } from 'react';
 import {DropdownProps} from 'semantic-ui-react';
 
-import {useWeaveFeaturesContext} from '../../../context';
-import {useWeaveContext} from '../../../context';
+import {useWeaveContext, useWeaveFeaturesContext} from '../../../context';
 import {usePrevious} from '../../../hookUtils';
 import {useExpandedNode} from '../../../react';
 import {PanelStack, usePanelStacksForType} from '../availablePanels';
@@ -237,8 +236,10 @@ export function usePanelExpressionState(props: PanelExpressionProps) {
     ? exp
     : refinedExpressionLoader.result;
 
-  const {loading: isExpanding, result: expanded} =
-    useExpandedNode(refinedExpression);
+  const {loading: isExpanding, result: expanded} = useExpandedNode(
+    refinedExpression,
+    newVars
+  );
 
   // Call the user's expression. If the expression contains variables that
   // are no longer present in the frame, then the result is void.

weave-js/src/react.tsx

@@ -1235,10 +1235,15 @@ export const useNodeWithServerType: typeof useNodeWithServerTypeDoNotCallMeDirec
   };
 
 export const useExpandedNode = (
-  node: NodeOrVoidNode
+  node: NodeOrVoidNode,
+  newVars?: {[key: string]: Node} | null
 ): {loading: boolean; result: NodeOrVoidNode} => {
   const [error, setError] = useState();
-  const {stack} = usePanelContext();
+  const {stack: origStack} = usePanelContext();
+
+  const stack = useMemo(() => {
+    return pushFrame(origStack, newVars ?? {});
+  }, [newVars, origStack]);
 
   let dereffedNode: NodeOrVoidNode;
   ({node, dereffedNode} = useRefEqualExpr(node, stack));