From aee9a8366ffee854864924ebaee90d8ac0863eb8 Mon Sep 17 00:00:00 2001
From: lyzno1 <yuanyouhuilyz@gmail.com>
Date: Fri, 24 Oct 2025 10:07:02 +0800
Subject: [PATCH] refactor: move marketplace footer outside scroll containers

---
 .../block-selector/all-start-blocks.tsx       |  13 +-
 .../workflow/block-selector/all-tools.tsx     | 170 ++++++++++--------
 .../market-place-plugin/list.tsx              |   5 +
 3 files changed, 104 insertions(+), 84 deletions(-)

diff --git a/web/app/components/workflow/block-selector/all-start-blocks.tsx b/web/app/components/workflow/block-selector/all-start-blocks.tsx
index 47ebf0ca27..c700dd8b75 100644
--- a/web/app/components/workflow/block-selector/all-start-blocks.tsx
+++ b/web/app/components/workflow/block-selector/all-start-blocks.tsx
@@ -2,7 +2,6 @@
 import {
   useCallback,
   useEffect,
-  useRef,
   useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -19,6 +18,8 @@ import Button from '@/app/components/base/button'
 import { SearchMenu } from '@/app/components/base/icons/src/vender/line/general'
 import { BlockEnum as BlockEnumValue } from '../types'
 
+const marketplaceFooterClassName = 'system-sm-medium z-10 flex h-8 flex-none cursor-pointer items-center rounded-b-lg border-[0.5px] border-t border-components-panel-border bg-components-panel-bg-blur px-4 py-1 text-text-accent-light-mode-only shadow-lg'
+
 type AllStartBlocksProps = {
   className?: string
   searchText: string
@@ -35,7 +36,6 @@ const AllStartBlocks = ({
   tags = [],
 }: AllStartBlocksProps) => {
   const { t } = useTranslation()
-  const wrapElemRef = useRef<HTMLDivElement>(null)
   const [hasStartBlocksContent, setHasStartBlocksContent] = useState(false)
   const [hasPluginContent, setHasPluginContent] = useState(false)
 
@@ -62,11 +62,8 @@ const AllStartBlocks = ({
 
   return (
     <div className={cn('min-w-[400px] max-w-[500px]', className)}>
-      <div
-        ref={wrapElemRef}
-        className='flex max-h-[640px] flex-col overflow-y-auto'
-      >
-        <div className='flex-1'>
+      <div className='flex max-h-[640px] flex-col'>
+        <div className='flex-1 overflow-y-auto'>
           <div className={cn(shouldShowEmptyState && 'hidden')}>
             <StartBlocks
               searchText={searchText}
@@ -110,7 +107,7 @@ const AllStartBlocks = ({
         {!shouldShowEmptyState && (
           // Footer - Same as Tools tab marketplace footer
           <Link
-            className='system-sm-medium sticky bottom-0 z-10 flex h-8 cursor-pointer items-center rounded-b-lg border-[0.5px] border-t border-components-panel-border bg-components-panel-bg-blur px-4 py-1 text-text-accent-light-mode-only shadow-lg'
+            className={marketplaceFooterClassName}
             href={getMarketplaceUrl('')}
             target='_blank'
           >
diff --git a/web/app/components/workflow/block-selector/all-tools.tsx b/web/app/components/workflow/block-selector/all-tools.tsx
index 97e18c43c3..8fe9a67f86 100644
--- a/web/app/components/workflow/block-selector/all-tools.tsx
+++ b/web/app/components/workflow/block-selector/all-tools.tsx
@@ -32,6 +32,10 @@ import RAGToolSuggestions from './rag-tool-suggestions'
 import FeaturedTools from './featured-tools'
 import Link from 'next/link'
 import Divider from '@/app/components/base/divider'
+import { RiArrowRightUpLine } from '@remixicon/react'
+import { getMarketplaceUrl } from '@/utils/var'
+
+const marketplaceFooterClassName = 'system-sm-medium z-10 flex h-8 flex-none cursor-pointer items-center rounded-b-lg border-[0.5px] border-t border-components-panel-border bg-components-panel-bg-blur px-4 py-1 text-text-accent-light-mode-only shadow-lg'
 
 type AllToolsProps = {
   className?: string
@@ -173,6 +177,7 @@ const AllTools = ({
     && activeTab === ToolTypeEnum.All
     && !hasFilter
     && (featuredLoading || featuredPlugins.length > 0)
+  const shouldShowMarketplaceFooter = enable_marketplace && !hasFilter
 
   return (
     <div className={cn('min-w-[400px] max-w-[500px]', className)}>
@@ -198,90 +203,103 @@ const AllTools = ({
           <ViewTypeSelect viewType={activeView} onChange={setActiveView} />
         )}
       </div>
-      <div
-        ref={wrapElemRef}
-        className='flex max-h-[464px] flex-col overflow-y-auto'
-        onScroll={pluginRef.current?.handleScroll}
-      >
-        <div className={cn('flex-1', shouldShowEmptyState && 'hidden')}>
-          {isShowRAGRecommendations && onTagsChange && (
-            <RAGToolSuggestions
-              viewType={isSupportGroupView ? activeView : ViewType.flat}
-              onSelect={onSelect}
-              onTagsChange={onTagsChange}
-            />
-          )}
-          {shouldShowFeatured && (
-            <>
-              <FeaturedTools
-                plugins={featuredPlugins}
-                providerMap={providerMap}
+      <div className='flex max-h-[464px] flex-col'>
+        <div
+          ref={wrapElemRef}
+          className='flex-1 overflow-y-auto'
+          onScroll={pluginRef.current?.handleScroll}
+        >
+          <div className={cn(shouldShowEmptyState && 'hidden')}>
+            {isShowRAGRecommendations && onTagsChange && (
+              <RAGToolSuggestions
+                viewType={isSupportGroupView ? activeView : ViewType.flat}
                 onSelect={onSelect}
-                selectedTools={selectedTools}
-                canChooseMCPTool={canChooseMCPTool}
-                isLoading={featuredLoading}
-                onInstallSuccess={async () => {
-                  await onFeaturedInstallSuccess?.()
-                }}
+                onTagsChange={onTagsChange}
               />
-              <div className='px-3'>
-                <Divider className='!h-px' />
-              </div>
-            </>
-          )}
-          {(hasToolsListContent || enable_marketplace) && (
-            <>
-              <div className='px-3 pb-1 pt-2'>
-                <span className='system-xs-medium text-text-primary'>{t('tools.allTools')}</span>
-              </div>
-              {hasToolsListContent && (
-                <Tools
-                  className={toolContentClassName}
-                  tools={tools}
+            )}
+            {shouldShowFeatured && (
+              <>
+                <FeaturedTools
+                  plugins={featuredPlugins}
+                  providerMap={providerMap}
                   onSelect={onSelect}
-                  canNotSelectMultiple={canNotSelectMultiple}
-                  onSelectMultiple={onSelectMultiple}
-                  toolType={activeTab}
-                  viewType={isSupportGroupView ? activeView : ViewType.flat}
-                  hasSearchText={hasSearchText}
                   selectedTools={selectedTools}
                   canChooseMCPTool={canChooseMCPTool}
-                  isShowRAGRecommendations={isShowRAGRecommendations}
+                  isLoading={featuredLoading}
+                  onInstallSuccess={async () => {
+                    await onFeaturedInstallSuccess?.()
+                  }}
                 />
-              )}
-              {enable_marketplace && (
-                <PluginList
-                  ref={pluginRef}
-                  wrapElemRef={wrapElemRef as RefObject<HTMLElement>}
-                  list={notInstalledPlugins}
-                  searchText={searchText}
-                  toolContentClassName={toolContentClassName}
-                  tags={tags}
-                />
-              )}
-            </>
+                <div className='px-3'>
+                  <Divider className='!h-px' />
+                </div>
+              </>
+            )}
+            {(hasToolsListContent || enable_marketplace) && (
+              <>
+                <div className='px-3 pb-1 pt-2'>
+                  <span className='system-xs-medium text-text-primary'>{t('tools.allTools')}</span>
+                </div>
+                {hasToolsListContent && (
+                  <Tools
+                    className={toolContentClassName}
+                    tools={tools}
+                    onSelect={onSelect}
+                    canNotSelectMultiple={canNotSelectMultiple}
+                    onSelectMultiple={onSelectMultiple}
+                    toolType={activeTab}
+                    viewType={isSupportGroupView ? activeView : ViewType.flat}
+                    hasSearchText={hasSearchText}
+                    selectedTools={selectedTools}
+                    canChooseMCPTool={canChooseMCPTool}
+                    isShowRAGRecommendations={isShowRAGRecommendations}
+                  />
+                )}
+                {enable_marketplace && (
+                  <PluginList
+                    ref={pluginRef}
+                    wrapElemRef={wrapElemRef as RefObject<HTMLElement>}
+                    list={notInstalledPlugins}
+                    searchText={searchText}
+                    toolContentClassName={toolContentClassName}
+                    tags={tags}
+                    hideFindMoreFooter
+                  />
+                )}
+              </>
+            )}
+          </div>
+
+          {shouldShowEmptyState && (
+            <div className='flex h-full flex-col items-center justify-center gap-3 py-12 text-center'>
+              <SearchMenu className='h-8 w-8 text-text-quaternary' />
+              <div className='text-sm font-medium text-text-secondary'>
+                {t('workflow.tabs.noPluginsFound')}
+              </div>
+              <Link
+                href='https://github.com/langgenius/dify-plugins/issues/new?template=plugin_request.yaml'
+                target='_blank'
+              >
+                <Button
+                  size='small'
+                  variant='secondary-accent'
+                  className='h-6 cursor-pointer px-3 text-xs'
+                >
+                  {t('workflow.tabs.requestToCommunity')}
+                </Button>
+              </Link>
+            </div>
           )}
         </div>
-
-        {shouldShowEmptyState && (
-          <div className='flex h-full flex-col items-center justify-center gap-3 py-12 text-center'>
-            <SearchMenu className='h-8 w-8 text-text-quaternary' />
-            <div className='text-sm font-medium text-text-secondary'>
-              {t('workflow.tabs.noPluginsFound')}
-            </div>
-            <Link
-              href='https://github.com/langgenius/dify-plugins/issues/new?template=plugin_request.yaml'
-              target='_blank'
-            >
-              <Button
-                size='small'
-                variant='secondary-accent'
-                className='h-6 cursor-pointer px-3 text-xs'
-              >
-                {t('workflow.tabs.requestToCommunity')}
-              </Button>
-            </Link>
-          </div>
+        {shouldShowMarketplaceFooter && (
+          <Link
+            className={marketplaceFooterClassName}
+            href={getMarketplaceUrl('')}
+            target='_blank'
+          >
+            <span>{t('plugin.findMoreInMarketplace')}</span>
+            <RiArrowRightUpLine className='ml-0.5 h-3 w-3' />
+          </Link>
         )}
       </div>
     </div>
diff --git a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
index 97084e0b5b..879f5c049d 100644
--- a/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
+++ b/web/app/components/workflow/block-selector/market-place-plugin/list.tsx
@@ -18,6 +18,7 @@ export type ListProps = {
   tags: string[]
   toolContentClassName?: string
   disableMaxWidth?: boolean
+  hideFindMoreFooter?: boolean
   ref?: React.Ref<ListRef>
 }
 
@@ -30,6 +31,7 @@ const List = ({
   list,
   toolContentClassName,
   disableMaxWidth = false,
+  hideFindMoreFooter = false,
   ref,
 }: ListProps) => {
   const { t } = useTranslation()
@@ -70,6 +72,9 @@ const List = ({
   }
 
   if (noFilter) {
+    if (hideFindMoreFooter)
+      return null
+
     return (
       <Link
         className='system-sm-medium sticky bottom-0 z-10 flex h-8 cursor-pointer items-center rounded-b-lg border-[0.5px] border-t border-components-panel-border bg-components-panel-bg-blur px-4 py-1 text-text-accent-light-mode-only shadow-lg'