fix trigger vs block scoping

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx

@@ -97,12 +97,7 @@ export function Editor() {
     )
   )
 
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = currentBlock?.data?.canonicalModes
-  const subBlocksForAdvancedCheck = useMemo(() => {
+  const subBlocksForCanonical = useMemo(() => {
     const subBlocks = blockConfig?.subBlocks || []
     if (!triggerMode) return subBlocks
     return subBlocks.filter(
@@ -111,16 +106,21 @@ export function Editor() {
     )
   }, [blockConfig?.subBlocks, triggerMode])
 
+  const canonicalIndex = useMemo(
+    () => buildCanonicalIndex(subBlocksForCanonical),
+    [subBlocksForCanonical]
+  )
+  const canonicalModeOverrides = currentBlock?.data?.canonicalModes
   const advancedValuesPresent = hasAdvancedValues(
-    subBlocksForAdvancedCheck,
+    subBlocksForCanonical,
     blockSubBlockValues,
     canonicalIndex
   )
   const displayAdvancedOptions = advancedMode || advancedValuesPresent
 
   const hasAdvancedOnlyFields = useMemo(
-    () => hasStandaloneAdvancedFields(subBlocksForAdvancedCheck, canonicalIndex),
-    [subBlocksForAdvancedCheck, canonicalIndex]
+    () => hasStandaloneAdvancedFields(subBlocksForCanonical, canonicalIndex),
+    [subBlocksForCanonical, canonicalIndex]
   )
 
   // Get subblock layout using custom hook

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts

@@ -87,7 +87,13 @@ export function useEditorSubblockLayout(
       {}
     )
 
-    const canonicalIndex = buildCanonicalIndex(config.subBlocks || [])
+    const subBlocksForCanonical = displayTriggerMode
+      ? (config.subBlocks || []).filter(
+          (subBlock) =>
+            subBlock.mode === 'trigger' || subBlock.type === ('trigger-config' as SubBlockType)
+        )
+      : config.subBlocks || []
+    const canonicalIndex = buildCanonicalIndex(subBlocksForCanonical)
     const effectiveAdvanced = displayAdvancedMode
     const canonicalModeOverrides = blockData?.canonicalModes