@lobehub/lobehub 2.0.0-next.94 → 2.0.0-next.96

package/src/app/[variants]/(main)/settings/_layout/Desktop/index.tsx

@@ -1,11 +1,11 @@
 'use client';
 
 import { useResponsive, useTheme } from 'antd-style';
-import { memo, useRef } from 'react';
+import { memo, useEffect, useRef } from 'react';
 import { Flexbox } from 'react-layout-kit';
+import { useSearchParams } from 'react-router-dom';
 
 import SettingContainer from '@/features/Setting/SettingContainer';
-import { parseAsStringEnum, useQueryParam } from '@/hooks/useQueryParam';
 import { SettingsTabs } from '@/store/global/initialState';
 
 import CategoryContent from '../CategoryContent';
@@ -13,18 +13,51 @@ import SettingsContent from '../SettingsContent';
 import { LayoutProps } from '../type';
 import Header from './Header';
 import SideBar from './SideBar';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 const Layout = memo<LayoutProps>(() => {
   const ref = useRef<HTMLDivElement | null>(null);
   const { md = true } = useResponsive();
   const theme = useTheme();
 
-  const [activeTab, setActiveTab] = useQueryParam(
-    'active',
-    parseAsStringEnum(Object.values(SettingsTabs)).withDefault(SettingsTabs.Common),
-  );
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const [activeTabState, setActiveTabState] = useMergedState({
+    active: searchParams.get('active') as SettingsTabs ? searchParams.get('active') as SettingsTabs : SettingsTabs.Common,
+  }, {
+    onChange: (obj: {
+      active: SettingsTabs;
+      provider?: string;
+    }) => {
+      if (obj.provider) {
+        setSearchParams({ active: obj.active, provider: obj.provider });
+      } else {
+        searchParams.delete('provider');
+        setSearchParams({ active: obj.active });
+      }
+    },
+  });
+
+  const setActiveTab = (tab: SettingsTabs) => {
+    if (tab === SettingsTabs.Provider) {
+      setActiveTabState({ active: tab, provider: 'all' });
+    } else {
+      setActiveTabState({
+        active: tab,
+      });
+    }
+  };
+
+  useEffect(() => {
+    return () => {
+      setSearchParams((prevParams) => {
+        prevParams.delete('active');
+        return prevParams;
+      });
+    };
+  }, []);
 
-  const category = <CategoryContent activeTab={activeTab} onMenuSelect={setActiveTab} />;
+  const category = <CategoryContent activeTab={activeTabState.active} onMenuSelect={setActiveTab} />;
 
   return (
     <Flexbox
@@ -39,7 +72,7 @@ const Layout = memo<LayoutProps>(() => {
         <Header getContainer={() => ref.current!}>{category}</Header>
       )}
       <SettingContainer maxWidth={'none'}>
-        <SettingsContent activeTab={activeTab} mobile={false} />
+        <SettingsContent activeTab={activeTabState.active} mobile={false} />
       </SettingContainer>
     </Flexbox>
   );

package/src/app/[variants]/(main)/settings/provider/(list)/ProviderGrid/Card.tsx

@@ -5,7 +5,6 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import Link from '@/components/Link';
 import { AiProviderListItem } from '@/types/aiProvider';
 
 import EnableSwitch from './EnableSwitch';
@@ -13,9 +12,10 @@ import { useStyles } from './style';
 
 interface ProviderCardProps extends AiProviderListItem {
   loading?: boolean;
+  onProviderSelect: (provider: string) => void;
 }
 const ProviderCard = memo<ProviderCardProps>(
-  ({ id, description, name, enabled, source, logo, loading }) => {
+  ({ id, description, name, enabled, source, logo, loading, onProviderSelect }) => {
     const { t } = useTranslation('providers');
     const { cx, styles, theme } = useStyles();
 
@@ -33,7 +33,9 @@ const ProviderCard = memo<ProviderCardProps>(
     return (
       <Flexbox className={cx(styles.container)} gap={24}>
         <Flexbox gap={12} padding={16} width={'100%'}>
-          <Link href={`/settings?active=provider&provider=${id}`}>
+          <div onClick={() => {
+            onProviderSelect(id);
+          }} style={{ cursor: 'pointer' }}>
             <Flexbox gap={12} width={'100%'}>
               <Flexbox align={'center'} horizontal justify={'space-between'}>
                 {source === 'builtin' ? (
@@ -68,7 +70,7 @@ const ProviderCard = memo<ProviderCardProps>(
                 {source === 'custom' ? description : t(`${id}.description`)}
               </Text>
             </Flexbox>
-          </Link>
+          </div>
           <Divider style={{ margin: '4px 0' }} />
           <Flexbox horizontal justify={'space-between'}>
             <div />

package/src/app/[variants]/(main)/settings/provider/(list)/ProviderGrid/index.tsx

@@ -14,7 +14,12 @@ const loadingArr = Array.from({ length: 12 })
   .fill('-')
   .map((item, index) => `${index}x${item}`);
 
-const List = memo(() => {
+type ListProps = {
+  onProviderSelect: (provider: string) => void;
+};
+
+const List = memo((props: ListProps) => {
+  const { onProviderSelect } = props;
   const { t } = useTranslation('modelProvider');
   const enabledList = useAiInfraStore(aiProviderSelectors.enabledAiProviderList, isEqual);
   const disabledList = useAiInfraStore(aiProviderSelectors.disabledAiProviderList, isEqual);
@@ -30,7 +35,14 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {loadingArr.map((item) => (
-            <Card enabled={false} id={item} key={item} loading source={'builtin'} />
+            <Card
+              enabled={false}
+              id={item}
+              key={item}
+              loading
+              onProviderSelect={onProviderSelect}
+              source={'builtin'}
+            />
           ))}
         </Grid>
       </Flexbox>
@@ -47,7 +59,7 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {enabledList.map((item) => (
-            <Card {...item} key={item.id} />
+            <Card {...item} key={item.id} onProviderSelect={onProviderSelect} />
           ))}
         </Grid>
       </Flexbox>
@@ -60,7 +72,7 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {disabledList.map((item) => (
-            <Card {...item} key={item.id} />
+            <Card {...item} key={item.id} onProviderSelect={onProviderSelect} />
           ))}
         </Grid>
       </Flexbox>

package/src/app/[variants]/(main)/settings/provider/(list)/index.tsx

@@ -1,20 +1,32 @@
 'use client';
 
 import { isCustomBranding } from '@/const/version';
-import { parseAsString, useQueryParam } from '@/hooks/useQueryParam';
 
 import DesktopLayout from '../_layout/Desktop';
 import MobileLayout from '../_layout/Mobile';
 import ProviderDetailPage from '../detail';
 import Footer from './Footer';
+import { useMemo, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 
 const Page = (props: { mobile?: boolean }) => {
-  const [Provider, setProvider] = useQueryParam('provider', parseAsString.withDefault('all'));
+  const [SearchParams, setSearchParams] = useSearchParams();
+  const [provider, setProviderState] = useState(SearchParams.get('provider') || 'all');
+  const setProvider = (provider: string) => {
+    setSearchParams({ active: 'provider', provider });
+    setProviderState(provider);
+  };
+
   const { mobile } = props;
   const ProviderLayout = mobile ? MobileLayout : DesktopLayout;
+
+  const ProviderListPage = useMemo(() => {
+    return <ProviderDetailPage id={provider} onProviderSelect={setProvider} />;
+  }, [provider]);
+
   return (
     <ProviderLayout onProviderSelect={setProvider}>
-      <ProviderDetailPage id={Provider} />
+      {ProviderListPage}
       {!isCustomBranding && <Footer />}
     </ProviderLayout>
   );

package/src/app/[variants]/(main)/settings/provider/detail/index.tsx

@@ -1,22 +1,30 @@
-import NewAPI from './newapi';
-import ProviderGrid from '../(list)/ProviderGrid';
-import Azure from './azure';
-import AzureAI from './azureai';
-import Bedrock from './bedrock';
-import Cloudflare from './cloudflare';
-import ComfyUI from './comfyui';
-import DefaultPage from './default/ProviderDetialPage';
-import GitHub from './github';
-import Ollama from './ollama';
-import OpenAI from './openai';
-import VertexAI from './vertexai';
+import dynamic from 'next/dynamic';
+import Loading from '@/components/Loading/BrandTextLoading';
 
-const ProviderDetailPage = (props: { id?: string | null }) => {
-  const { id } = props;
+const NewAPI = dynamic(() => import('./newapi'), { loading: () => <Loading />, ssr: false });
+const OpenAI = dynamic(() => import('./openai'), { loading: () => <Loading />, ssr: false });
+const VertexAI = dynamic(() => import('./vertexai'), { loading: () => <Loading />, ssr: false });
+const GitHub = dynamic(() => import('./github'), { loading: () => <Loading />, ssr: false });
+const Ollama = dynamic(() => import('./ollama'), { loading: () => <Loading />, ssr: false });
+const ComfyUI = dynamic(() => import('./comfyui'), { loading: () => <Loading />, ssr: false });
+const Cloudflare = dynamic(() => import('./cloudflare'), { loading: () => <Loading />, ssr: false });
+const Bedrock = dynamic(() => import('./bedrock'), { loading: () => <Loading />, ssr: false });
+const AzureAI = dynamic(() => import('./azureai'), { loading: () => <Loading />, ssr: false });
+const Azure = dynamic(() => import('./azure'), { loading: () => <Loading />, ssr: false });
+const ProviderGrid = dynamic(() => import('../(list)/ProviderGrid'), { loading: () => <Loading />, ssr: false });
+const DefaultPage = dynamic(() => import('./default/ProviderDetialPage'), { loading: () => <Loading />, ssr: false });
+
+type ProviderDetailPageProps = {
+  id?: string | null;
+  onProviderSelect: (provider: string) => void;
+}
+
+const ProviderDetailPage = (props: ProviderDetailPageProps) => {
+  const { id, onProviderSelect } = props;
 
   switch (id) {
     case 'all': {
-      return <ProviderGrid />;
+      return <ProviderGrid onProviderSelect={onProviderSelect} />;
     }
     case 'azure': {
       return <Azure />;

package/src/features/Conversation/MarkdownElements/remarkPlugins/createRemarkSelfClosingTagPlugin.test.ts

@@ -249,4 +249,29 @@ describe('createRemarkSelfClosingTagPlugin', () => {
 
     expect(tree).toMatchSnapshot();
   });
+
+  it('should handle tags wrapped in backticks (code)', () => {
+    const markdown = `Use this file: \`<${tagName} name="config.json" path="/app/config.json" />\` in your code.`;
+    const tree = processMarkdown(markdown, tagName);
+
+    expect(tree.children).toHaveLength(1);
+    expect(tree.children[0].type).toBe('paragraph');
+
+    const paragraphChildren = tree.children[0].children;
+    expect(paragraphChildren).toHaveLength(3);
+
+    expect(paragraphChildren[0].type).toBe('text');
+    expect(paragraphChildren[0].value).toBe('Use this file: ');
+
+    // The tag should be parsed even inside backticks
+    const tagNode = paragraphChildren[1];
+    expect(tagNode.type).toBe(tagName);
+    expect(tagNode.data?.hProperties).toEqual({
+      name: 'config.json',
+      path: '/app/config.json',
+    });
+
+    expect(paragraphChildren[2].type).toBe('text');
+    expect(paragraphChildren[2].value).toBe(' in your code.');
+  });
 });

package/src/features/Conversation/MarkdownElements/remarkPlugins/createRemarkSelfClosingTagPlugin.ts

@@ -130,5 +130,33 @@ export const createRemarkSelfClosingTagPlugin =
           return [SKIP, index + newChildren.length]; // Skip new nodes
         }
       });
+
+      // 3. Visit inlineCode nodes (backtick-wrapped tags like `<localFile ... />`)
+      // @ts-ignore
+      visit(tree, 'inlineCode', (node: any, index: number, parent) => {
+        log('>>> Visiting inlineCode node: "%s"', node.value);
+
+        if (!parent || typeof index !== 'number' || !node.value?.includes(`<${tagName}`)) {
+          return;
+        }
+
+        const match = node.value.match(exactTagRegex);
+        if (match) {
+          const [, attributesString] = match;
+          const properties = attributesString ? parseAttributes(attributesString.trim()) : {};
+
+          const newNode = {
+            data: {
+              hName: tagName,
+              hProperties: properties,
+            },
+            type: tagName,
+          };
+
+          log('Replacing inlineCode node at index %d with %s node: %o', index, tagName, newNode);
+          parent.children.splice(index, 1, newNode);
+          return [SKIP, index + 1];
+        }
+      });
     };
   };