From 649283df09481c83e37ffa782f19719b0c74b304 Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Fri, 16 Jan 2026 15:05:16 +0800
Subject: [PATCH] fix: not popup and use new setting

---
 .../skill/editor/skill-editor/index.tsx       |   5 +-
 .../plugins/tool-block/component.tsx          | 131 +++++++++------
 .../tool-setting/tool-settings-section.tsx    | 154 ++++++++++++++++++
 3 files changed, 235 insertions(+), 55 deletions(-)
 create mode 100644 web/app/components/workflow/skill/editor/skill-editor/tool-setting/tool-settings-section.tsx

diff --git a/web/app/components/workflow/skill/editor/skill-editor/index.tsx b/web/app/components/workflow/skill/editor/skill-editor/index.tsx
index 00d6db583c..ad6769d101 100644
--- a/web/app/components/workflow/skill/editor/skill-editor/index.tsx
+++ b/web/app/components/workflow/skill/editor/skill-editor/index.tsx
@@ -88,7 +88,10 @@ const SkillEditor: FC<SkillEditorProps> = ({
 
   return (
     <LexicalComposer initialConfig={{ ...initialConfig, editable }}>
-      <div className={cn('relative', showLineNumbers && styles.lineNumbersScope, wrapperClassName)}>
+      <div
+        className={cn('relative', showLineNumbers && styles.lineNumbersScope, wrapperClassName)}
+        data-skill-editor-root="true"
+      >
         <RichTextPlugin
           contentEditable={(
             <ContentEditable
diff --git a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
index 802a673fa2..462fb421e5 100644
--- a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
+++ b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx
@@ -4,17 +4,13 @@ import type { ToolValue } from '@/app/components/workflow/block-selector/types'
 import type { ToolWithProvider } from '@/app/components/workflow/types'
 import * as React from 'react'
 import { useEffect, useMemo, useState } from 'react'
+import { createPortal } from 'react-dom'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { useSelectOrDelete } from '@/app/components/base/prompt-editor/hooks'
 import ToolAuthorizationSection from '@/app/components/plugins/plugin-detail-panel/tool-selector/sections/tool-authorization-section'
-import ToolSettingsSection from '@/app/components/plugins/plugin-detail-panel/tool-selector/sections/tool-settings-section'
 import { generateFormValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
+import ToolSettingsSection from '@/app/components/workflow/skill/editor/skill-editor/tool-setting/tool-settings-section'
 import { useGetLanguage } from '@/context/i18n'
 import useTheme from '@/hooks/use-theme'
 import {
@@ -62,6 +58,7 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
   const { theme } = useTheme()
   const [isSettingOpen, setIsSettingOpen] = useState(false)
   const [toolValue, setToolValue] = useState<ToolValue | null>(null)
+  const [portalContainer, setPortalContainer] = useState<HTMLElement | null>(null)
   const { data: buildInTools } = useAllBuiltInTools()
   const { data: customTools } = useAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
@@ -125,6 +122,35 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
       setToolValue(defaultToolValue)
   }, [defaultToolValue, toolValue])
 
+  useEffect(() => {
+    const containerFromRef = ref.current?.closest('[data-skill-editor-root="true"]') as HTMLElement | null
+    const fallbackContainer = document.querySelector('[data-skill-editor-root="true"]') as HTMLElement | null
+    const container = containerFromRef || fallbackContainer
+    if (container)
+      setPortalContainer(container)
+  }, [ref])
+
+  useEffect(() => {
+    if (!isSettingOpen)
+      return
+
+    const handleClickOutside = (event: MouseEvent) => {
+      const target = event.target as Node | null
+      const triggerEl = ref.current
+      const panelEl = portalContainer?.querySelector('[data-tool-setting-panel="true"]')
+      if (!target || !panelEl)
+        return
+      if (panelEl.contains(target))
+        return
+      if (triggerEl && triggerEl.contains(target))
+        return
+      setIsSettingOpen(false)
+    }
+
+    document.addEventListener('mousedown', handleClickOutside)
+    return () => document.removeEventListener('mousedown', handleClickOutside)
+  }, [isSettingOpen, portalContainer, ref])
+
   const displayLabel = label || toolMeta?.label || tool
   const resolvedIcon = (() => {
     const fromNode = theme === Theme.dark ? iconDark : icon
@@ -173,60 +199,57 @@ const ToolBlockComponent: FC<ToolBlockComponentProps> = ({
   }
 
   return (
-    <PortalToFollowElem
-      placement="bottom-start"
-      offset={8}
-      open={isSettingOpen}
-      onOpenChange={setIsSettingOpen}
-    >
-      <PortalToFollowElemTrigger
-        asChild
-        onClick={() => {
+    <>
+      <span
+        ref={ref}
+        className={cn(
+          'inline-flex cursor-pointer items-center gap-[2px] rounded-[5px] border border-state-accent-hover-alt bg-state-accent-hover px-[4px] py-[1px] shadow-xs',
+          isSelected && 'border-text-accent',
+        )}
+        title={`${provider}.${tool}`}
+        data-tool-config-id={configId}
+        onMouseDown={() => {
           if (!currentProvider || !currentTool)
             return
           setIsSettingOpen(true)
         }}
       >
-        <span
-          ref={ref}
-          className={cn(
-            'inline-flex cursor-pointer items-center gap-[2px] rounded-[5px] border border-state-accent-hover-alt bg-state-accent-hover px-[4px] py-[1px] shadow-xs',
-            isSelected && 'border-text-accent',
-          )}
-          title={`${provider}.${tool}`}
-          data-tool-config-id={configId}
-        >
-          {renderIcon()}
-          <span className="system-xs-medium max-w-[180px] truncate text-text-accent">
-            {displayLabel}
-          </span>
+        {renderIcon()}
+        <span className="system-xs-medium max-w-[180px] truncate text-text-accent">
+          {displayLabel}
         </span>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-[999]">
-        <div className={cn('relative max-h-[642px] min-h-20 w-[361px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-4 shadow-lg backdrop-blur-sm', 'overflow-y-auto pb-2')}>
-          <div className="system-xl-semibold px-4 pb-1 pt-3.5 text-text-primary">{t('detailPanel.toolSelector.toolSetting', { ns: 'plugin' })}</div>
-          {currentProvider && currentTool && toolValue && (
-            <>
-              <div className="px-4 pb-2 text-xs text-text-tertiary">{displayLabel}</div>
-              <ToolAuthorizationSection
-                currentProvider={currentProvider}
-                credentialId={toolValue.credential_id}
-                onAuthorizationItemClick={handleAuthorizationItemClick}
-              />
-              <ToolSettingsSection
-                currentProvider={currentProvider}
-                currentTool={currentTool}
-                value={toolValue}
-                onChange={handleToolValueChange}
-                nodeId={undefined}
-                nodeOutputVars={[]}
-                availableNodes={[]}
-              />
-            </>
-          )}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </span>
+      {portalContainer && isSettingOpen && createPortal(
+        <div
+          className="absolute right-4 top-4 z-[999]"
+          data-tool-setting-panel="true"
+        >
+          <div className={cn('relative max-h-[642px] min-h-20 w-[361px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-4 shadow-lg backdrop-blur-sm', 'overflow-y-auto pb-2')}>
+            <div className="system-xl-semibold px-4 pb-1 pt-3.5 text-text-primary">{t('detailPanel.toolSelector.toolSetting', { ns: 'plugin' })}</div>
+            {currentProvider && currentTool && toolValue && (
+              <>
+                <div className="px-4 pb-2 text-xs text-text-tertiary">{displayLabel}</div>
+                <ToolAuthorizationSection
+                  currentProvider={currentProvider}
+                  credentialId={toolValue.credential_id}
+                  onAuthorizationItemClick={handleAuthorizationItemClick}
+                />
+                <ToolSettingsSection
+                  currentProvider={currentProvider}
+                  currentTool={currentTool}
+                  value={toolValue}
+                  onChange={handleToolValueChange}
+                  nodeId={undefined}
+                  nodeOutputVars={[]}
+                  availableNodes={[]}
+                />
+              </>
+            )}
+          </div>
+        </div>,
+        portalContainer,
+      )}
+    </>
   )
 }
 
diff --git a/web/app/components/workflow/skill/editor/skill-editor/tool-setting/tool-settings-section.tsx b/web/app/components/workflow/skill/editor/skill-editor/tool-setting/tool-settings-section.tsx
new file mode 100644
index 0000000000..260bed4bc3
--- /dev/null
+++ b/web/app/components/workflow/skill/editor/skill-editor/tool-setting/tool-settings-section.tsx
@@ -0,0 +1,154 @@
+'use client'
+
+import type { FC } from 'react'
+import type { Node } from 'reactflow'
+import type { Tool } from '@/app/components/tools/types'
+import type { ToolValue } from '@/app/components/workflow/block-selector/types'
+import type { NodeOutPutVar, ToolWithProvider } from '@/app/components/workflow/types'
+import * as React from 'react'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Divider from '@/app/components/base/divider'
+import TabSlider from '@/app/components/base/tab-slider-plain'
+import ReasoningConfigForm from '@/app/components/plugins/plugin-detail-panel/tool-selector/reasoning-config-form'
+import { getPlainValue, getStructureValue, toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
+import ToolForm from '@/app/components/workflow/nodes/tool/components/tool-form'
+
+type ToolSettingsSectionProps = {
+  currentProvider?: ToolWithProvider
+  currentTool?: Tool
+  value?: ToolValue
+  nodeId?: string
+  nodeOutputVars?: NodeOutPutVar[]
+  availableNodes?: Node[]
+  onChange?: (value: ToolValue) => void
+}
+
+const ToolSettingsSection: FC<ToolSettingsSectionProps> = ({
+  currentProvider,
+  currentTool,
+  value,
+  nodeId,
+  nodeOutputVars = [],
+  availableNodes = [],
+  onChange,
+}) => {
+  const { t } = useTranslation()
+  const [currType, setCurrType] = useState<'settings' | 'params'>('settings')
+  const safeNodeId = nodeId ?? ''
+
+  const currentToolSettings = useMemo(() => {
+    if (!currentTool)
+      return []
+    return currentTool.parameters?.filter(param => param.form !== 'llm') || []
+  }, [currentTool])
+  const currentToolParams = useMemo(() => {
+    if (!currentTool)
+      return []
+    return currentTool.parameters?.filter(param => param.form === 'llm') || []
+  }, [currentTool])
+
+  const settingsFormSchemas = useMemo(() => toolParametersToFormSchemas(currentToolSettings), [currentToolSettings])
+  const paramsFormSchemas = useMemo(() => toolParametersToFormSchemas(currentToolParams), [currentToolParams])
+
+  const allowReasoning = !!safeNodeId
+  const showTabSlider = allowReasoning && currentToolSettings.length > 0 && currentToolParams.length > 0
+  const userSettingsOnly = currentToolSettings.length > 0 && (!allowReasoning || !currentToolParams.length)
+  const reasoningConfigOnly = allowReasoning && currentToolParams.length > 0 && currentToolSettings.length === 0
+
+  const handleSettingsFormChange = (v: Record<string, any>) => {
+    if (!value || !onChange)
+      return
+    const newValue = getStructureValue(v)
+    onChange({
+      ...value,
+      settings: newValue,
+    })
+  }
+
+  const handleParamsFormChange = (v: Record<string, any>) => {
+    if (!value || !onChange)
+      return
+    onChange({
+      ...value,
+      parameters: v,
+    })
+  }
+
+  if (!currentProvider?.is_team_authorization)
+    return null
+
+  if (!currentToolSettings.length && !currentToolParams.length)
+    return null
+
+  return (
+    <>
+      <Divider className="my-1 w-full" />
+      {/* tabs */}
+      {showTabSlider && (
+        <TabSlider
+          className="mt-1 shrink-0 px-4"
+          itemClassName="py-3"
+          noBorderBottom
+          smallItem
+          value={currType}
+          onChange={(value) => {
+            setCurrType(value as 'settings' | 'params')
+          }}
+          options={[
+            { value: 'settings', text: t('detailPanel.toolSelector.settings', { ns: 'plugin' })! },
+            { value: 'params', text: t('detailPanel.toolSelector.params', { ns: 'plugin' })! },
+          ]}
+        />
+      )}
+      {showTabSlider && currType === 'params' && (
+        <div className="px-4 py-2">
+          <div className="system-xs-regular text-text-tertiary">{t('detailPanel.toolSelector.paramsTip1', { ns: 'plugin' })}</div>
+          <div className="system-xs-regular text-text-tertiary">{t('detailPanel.toolSelector.paramsTip2', { ns: 'plugin' })}</div>
+        </div>
+      )}
+      {/* user settings only */}
+      {userSettingsOnly && (
+        <div className="p-4 pb-1">
+          <div className="system-sm-semibold-uppercase text-text-primary">{t('detailPanel.toolSelector.settings', { ns: 'plugin' })}</div>
+        </div>
+      )}
+      {/* reasoning config only */}
+      {reasoningConfigOnly && (
+        <div className="mb-1 p-4 pb-1">
+          <div className="system-sm-semibold-uppercase text-text-primary">{t('detailPanel.toolSelector.params', { ns: 'plugin' })}</div>
+          <div className="pb-1">
+            <div className="system-xs-regular text-text-tertiary">{t('detailPanel.toolSelector.paramsTip1', { ns: 'plugin' })}</div>
+            <div className="system-xs-regular text-text-tertiary">{t('detailPanel.toolSelector.paramsTip2', { ns: 'plugin' })}</div>
+          </div>
+        </div>
+      )}
+      {/* user settings form */}
+      {(currType === 'settings' || userSettingsOnly) && (
+        <div className="px-4 py-2">
+          <ToolForm
+            inPanel
+            readOnly={false}
+            nodeId={safeNodeId}
+            schema={settingsFormSchemas as any}
+            value={getPlainValue(value?.settings || {})}
+            onChange={handleSettingsFormChange}
+          />
+        </div>
+      )}
+      {/* reasoning config form */}
+      {allowReasoning && (currType === 'params' || reasoningConfigOnly) && (
+        <ReasoningConfigForm
+          value={value?.parameters || {}}
+          onChange={handleParamsFormChange}
+          schemas={paramsFormSchemas as any}
+          nodeOutputVars={nodeOutputVars}
+          availableNodes={availableNodes}
+          nodeId={safeNodeId}
+        />
+      )}
+    </>
+  )
+}
+
+export default React.memo(ToolSettingsSection)