From 23f98652e18cdd2f1b1f78d8e6712c8ab9e6c36d Mon Sep 17 00:00:00 2001
From: zhsama <torvalds@linux.do>
Date: Wed, 4 Feb 2026 17:50:55 +0800
Subject: [PATCH] perf: Add null check for onAssembleVariables callback

---
 .../base/prompt-editor/plugins/component-picker-block/index.tsx | 2 +-
 .../nodes/_base/components/variable/var-reference-vars.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx b/web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx
index 028a49424a..fa7d78de70 100644
--- a/web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx
+++ b/web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx
@@ -255,7 +255,7 @@ const ComponentPicker = ({
   }, [editor, getMatchFromSelection, agentBlock, handleClose])
 
   const isAgentTrigger = triggerString === '@' && agentBlock?.show
-  const showAssembleVariables = triggerString === '/'
+  const showAssembleVariables = triggerString === '/' && workflowVariableBlock?.showAssembleVariables && !!workflowVariableBlock?.onAssembleVariables
   const agentNodes: AgentNode[] = useMemo(() => agentBlock?.agentNodes || [], [agentBlock?.agentNodes])
   const handleOpen = useCallback(() => {
     if (isSupportSandbox && triggerString === '/')
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
index dc9f12cf51..5f69aaf645 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@@ -502,7 +502,7 @@ const VarReferenceVars: FC<Props> = ({
       }
 
       {
-        showAssembleVariables && (
+        showAssembleVariables && onAssembleVariables && (
           <div className="flex items-center border-t border-divider-subtle pt-1">
             <button
               type="button"