e.preventDefault()} onDrop={handleDrop}>
{wandConfig?.enabled &&
!isAiStreaming &&
@@ -761,6 +761,11 @@ export function Code({
}}
onFocus={() => {
hasEditedSinceFocusRef.current = false
+ // Show tag dropdown on focus when code is empty
+ if (!isPreview && !disabled && !readOnly && code.trim() === '') {
+ setShowTags(true)
+ setCursorPosition(0)
+ }
}}
highlight={createHighlightFunction(effectiveLanguage, shouldHighlightReference)}
{...getCodeEditorProps({ isStreaming: isAiStreaming, isPreview, disabled })}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
index 0565fb998c..9eaab8c3a6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
@@ -2,16 +2,19 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useReactFlow } from 'reactflow'
import { Combobox, type ComboboxOption } from '@/components/emcn/components'
import { cn } from '@/lib/core/utils/cn'
+import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
+import { getBlock } from '@/blocks/registry'
import type { SubBlockConfig } from '@/blocks/types'
import { getDependsOnFields } from '@/blocks/utils'
import { usePermissionConfig } from '@/hooks/use-permission-config'
import { getProviderFromModel } from '@/providers/utils'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+import { useWorkflowStore } from '@/stores/workflows/workflow/store'
/**
* Constants for ComboBox component behavior
@@ -91,15 +94,24 @@ export function ComboBox({
// Dependency tracking for fetchOptions
const dependsOnFields = useMemo(() => getDependsOnFields(dependsOn), [dependsOn])
const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
+ const blockState = useWorkflowStore((state) => state.blocks[blockId])
+ const blockConfig = blockState?.type ? getBlock(blockState.type) : null
+ const canonicalIndex = useMemo(
+ () => buildCanonicalIndex(blockConfig?.subBlocks || []),
+ [blockConfig?.subBlocks]
+ )
+ const canonicalModeOverrides = blockState?.data?.canonicalModes
const dependencyValues = useSubBlockStore(
useCallback(
(state) => {
if (dependsOnFields.length === 0 || !activeWorkflowId) return []
const workflowValues = state.workflowValues[activeWorkflowId] || {}
const blockValues = workflowValues[blockId] || {}
- return dependsOnFields.map((depKey) => blockValues[depKey] ?? null)
+ return dependsOnFields.map((depKey) =>
+ resolveDependencyValue(depKey, blockValues, canonicalIndex, canonicalModeOverrides)
+ )
},
- [dependsOnFields, activeWorkflowId, blockId]
+ [dependsOnFields, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
)
)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
index 27232889b6..b37e6ecba1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -115,6 +115,7 @@ export function ConditionInput({
const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
const containerRef = useRef(null)
+ const inputRefs = useRef>(new Map())
/**
* Determines if a reference string should be highlighted in the editor.
@@ -728,6 +729,20 @@ export function ConditionInput({
})
}, [conditionalBlocks.length])
+ // Capture textarea refs from Editor components (condition mode)
+ useEffect(() => {
+ if (!isRouterMode && containerRef.current) {
+ conditionalBlocks.forEach((block) => {
+ const textarea = containerRef.current?.querySelector(
+ `[data-block-id="${block.id}"] textarea`
+ ) as HTMLTextAreaElement | null
+ if (textarea) {
+ inputRefs.current.set(block.id, textarea)
+ }
+ })
+ }
+ }, [conditionalBlocks, isRouterMode])
+
// Show loading or empty state if not ready or no blocks
if (!isReady || conditionalBlocks.length === 0) {
return (
@@ -842,6 +857,9 @@ export function ConditionInput({
onDrop={(e) => handleDrop(block.id, e)}
>
- 
+ 