@particle-network/ui-react 0.4.0-beta.2 → 0.4.0-beta.20

package/dist/components/UXTable/table.extend.d.ts

@@ -40,7 +40,7 @@ declare const ExtendedTable: import("react").ForwardRefExoticComponent<Omit<{
     vocab?: string | undefined;
     autoCorrect?: string | undefined;
     autoSave?: string | undefined;
-    color?: "default" | "secondary" | "primary" | "success" | "danger" | "warning" | undefined;
+    color?: "default" | "success" | "secondary" | "primary" | "danger" | "warning" | undefined;
     itemProp?: string | undefined;
     itemScope?: boolean | undefined;
     itemType?: string | undefined;
@@ -288,32 +288,32 @@ declare const ExtendedTable: import("react").ForwardRefExoticComponent<Omit<{
     layout?: "auto" | "fixed" | undefined;
     border?: number | undefined;
     key?: import("react").Key | null | undefined;
+    classNames?: import("@heroui/theme").SlotsToClasses<"table" | "base" | "tbody" | "td" | "tfoot" | "th" | "thead" | "tr" | "wrapper" | "sortIcon" | "emptyWrapper" | "loadingWrapper"> | undefined;
     disableAnimation?: boolean | undefined;
-    shadow?: "sm" | "md" | "lg" | "none" | undefined;
     summary?: string | undefined;
     as?: import("@heroui/system-rsc").As<any> | undefined;
-    bgcolor?: string | undefined;
-    cellPadding?: string | number | undefined;
-    cellSpacing?: string | number | undefined;
-    frame?: boolean | undefined;
-    rules?: "none" | "all" | "rows" | "groups" | "columns" | undefined;
-    classNames?: import("@heroui/theme").SlotsToClasses<"table" | "base" | "tbody" | "td" | "tfoot" | "th" | "thead" | "tr" | "wrapper" | "sortIcon" | "emptyWrapper" | "loadingWrapper"> | undefined;
-    topContent?: import("react").ReactNode;
-    bottomContent?: import("react").ReactNode;
+    baseRef?: import("@heroui/react-utils").ReactRef<HTMLElement | null> | undefined;
+    disallowEmptySelection?: boolean | undefined;
+    onSelectionChange?: ((keys: import("@react-types/shared").Selection) => void) | undefined;
+    disabledKeys?: Iterable<import("@react-types/shared").Key> | undefined;
     scrollRef?: import("@react-types/shared").RefObject<HTMLElement | null> | undefined;
     isVirtualized?: boolean | undefined;
+    shadow?: "sm" | "md" | "lg" | "none" | undefined;
+    topContent?: import("react").ReactNode;
+    bottomContent?: import("react").ReactNode;
+    keyboardDelegate?: import("@react-types/shared").KeyboardDelegate | undefined;
+    selectionBehavior?: "replace" | "toggle" | undefined;
+    shouldSelectOnPressUp?: boolean | undefined;
     escapeKeyBehavior?: "none" | "clearSelection" | undefined;
-    disabledKeys?: Iterable<import("@react-types/shared").Key> | undefined;
     selectionMode?: import("@react-types/shared").SelectionMode | undefined;
-    disallowEmptySelection?: boolean | undefined;
     selectedKeys?: "all" | Iterable<import("@react-types/shared").Key> | undefined;
     defaultSelectedKeys?: "all" | Iterable<import("@react-types/shared").Key> | undefined;
-    onSelectionChange?: ((keys: import("@react-types/shared").Selection) => void) | undefined;
-    baseRef?: import("@heroui/react-utils").ReactRef<HTMLElement | null> | undefined;
+    bgcolor?: string | undefined;
+    cellPadding?: string | number | undefined;
+    cellSpacing?: string | number | undefined;
+    frame?: boolean | undefined;
+    rules?: "none" | "all" | "rows" | "groups" | "columns" | undefined;
     isCompact?: boolean | undefined;
-    keyboardDelegate?: import("@react-types/shared").KeyboardDelegate | undefined;
-    selectionBehavior?: "replace" | "toggle" | undefined;
-    shouldSelectOnPressUp?: boolean | undefined;
     hideHeader?: boolean | undefined;
     isStriped?: boolean | undefined;
     isHeaderSticky?: boolean | undefined;

package/dist/components/UXTabs/tabs.classes.js

@@ -3,7 +3,7 @@ const tabsClasses = {
     variants: {
         variant: {
             solid: {
-                tabList: 'gap-0 bg-background-400',
+                tabList: 'gap-0 bg-background-200',
                 tab: 'py-0 !outline-none',
                 cursor: 'shadow-none inset-0',
                 tabContent: 'text-foreground-300 font-medium'
@@ -252,9 +252,9 @@ const tabsClasses = {
             color: 'default',
             class: {
                 cursor: [
-                    'bg-background-200'
+                    '!bg-tertiary'
                 ],
-                tabContent: 'group-data-[selected=true]:text-default-foreground'
+                tabContent: 'group-data-[selected=true]:text-tertiary-foreground'
             }
         },
         {
@@ -264,9 +264,9 @@ const tabsClasses = {
             color: 'default',
             class: {
                 cursor: [
-                    'bg-foreground-100'
+                    '!bg-tertiary'
                 ],
-                tabContent: 'group-data-[selected=true]:text-default-foreground'
+                tabContent: 'group-data-[selected=true]:text-tertiary-foreground'
             }
         },
         {
@@ -276,9 +276,9 @@ const tabsClasses = {
             color: 'default',
             class: {
                 cursor: [
-                    'bg-background-300'
+                    '!bg-tertiary'
                 ],
-                tabContent: 'group-data-[selected=true]:text-default-foreground'
+                tabContent: 'group-data-[selected=true]:text-tertiary-foreground'
             }
         },
         {

package/dist/components/UXThemeSwitch/index.d.ts

@@ -1,4 +1,3 @@
-export * from './theme-data';
 export * from './theme-switch';
 export * from './use-color-scheme';
 export * from './use-theme';

package/dist/components/UXThemeSwitch/index.js

@@ -1,4 +1,3 @@
-export * from "./theme-data.js";
 export * from "./theme-switch.js";
 export * from "./use-color-scheme.js";
 export * from "./use-theme.js";

package/dist/components/UXThemeSwitch/theme-item.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { ThemeItemType } from './theme-data';
+import type { ThemeItemType } from '@particle-network/ui-shared';
 export interface ThemeItemProps extends ThemeItemType {
     isSelected: boolean;
     onClick: () => void;

package/dist/components/UXThemeSwitch/theme-item.js

@@ -8,15 +8,16 @@ const ThemeItem = ({ id, zhName, enName, isSelected, onClick })=>{
     const lang = useLang();
     return /*#__PURE__*/ jsxs(VStack, {
         center: true,
-        className: cn('cursor-pointer hover:scale-105 transition-all duration-300', id),
+        gap: 2,
+        className: cn('cursor-pointer', id),
         onClick: onClick,
         children: [
             /*#__PURE__*/ jsx("div", {
-                className: cn('rounded-small border-1.5', isSelected ? 'border-primary' : 'border-transparent'),
+                className: cn('rounded-medium border-2 hover:scale-105 transition-all duration-300', isSelected ? 'border-primary' : 'border-transparent'),
                 children: /*#__PURE__*/ jsxs("svg", {
                     xmlns: "http://www.w3.org/2000/svg",
-                    width: "180",
-                    height: "106.5",
+                    width: "120",
+                    height: "71",
                     viewBox: "0 0 120 71",
                     fill: "none",
                     children: [

package/dist/components/UXThemeSwitch/theme-switch.js

@@ -1,21 +1,21 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import "react";
-import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from "@heroui/drawer";
 import { useDisclosure } from "@heroui/use-disclosure";
-import { ThemeSwitchIcon } from "@particle-network/icons/web";
+import { ChartColorSwitchIcon } from "@particle-network/icons/web";
+import { themeData } from "@particle-network/ui-shared";
 import { useI18n } from "../../hooks/index.js";
-import { Flex, HStack, VStack } from "../layout/index.js";
+import { HStack, VStack } from "../layout/index.js";
 import { Text } from "../typography/Text.js";
 import { UXButton } from "../UXButton/index.js";
 import { UXDivider } from "../UXDivider/index.js";
+import { UXDrawer } from "../UXDrawer/index.js";
 import { UXInput } from "../UXInput/index.js";
 import { UXSpinner } from "../UXSpinner/index.js";
-import { themeData } from "./theme-data.js";
 import { ThemeItem } from "./theme-item.js";
 import { useTheme } from "./use-theme.js";
 const UXThemeSwitchDrawer = ({ isOpen, onClose, onOpenChange, ...props })=>{
     const i18n = useI18n();
-    const { selectedTheme, setSelectedTheme, savedTheme, setSavedTheme, selectedFontLink, setSelectedFontLink, savedFontLink, setSavedFontLink, fontName, fontLoadStatus, fontLoadError } = useTheme();
+    const { selectedTheme, setSelectedTheme, savedTheme, setSavedTheme, selectedFontLink, setSelectedFontLink, savedFontLink, setSavedFontLink, fontName, fontLoadStatus } = useTheme();
     const handleOpenChange = (_isOpen)=>{
         onOpenChange?.(_isOpen);
         if (!_isOpen) {
@@ -32,96 +32,82 @@ const UXThemeSwitchDrawer = ({ isOpen, onClose, onOpenChange, ...props })=>{
         setSelectedTheme(savedTheme);
         setSelectedFontLink(savedFontLink);
     };
-    return /*#__PURE__*/ jsx(Drawer, {
+    return /*#__PURE__*/ jsxs(UXDrawer, {
         isOpen: isOpen,
         backdrop: "transparent",
-        onOpenChange: handleOpenChange,
-        ...props,
-        children: /*#__PURE__*/ jsxs(DrawerContent, {
+        title: i18n.theme.title,
+        footer: /*#__PURE__*/ jsxs(HStack, {
+            fullWidth: true,
+            gap: "lg",
             children: [
-                /*#__PURE__*/ jsx(DrawerHeader, {
-                    className: "flex flex-col gap-1",
-                    children: i18n.theme.title
+                /*#__PURE__*/ jsx(UXButton, {
+                    fullWidth: true,
+                    size: "lg",
+                    onPress: handleReset,
+                    children: i18n.theme.reset
                 }),
-                /*#__PURE__*/ jsxs(DrawerBody, {
-                    children: [
-                        /*#__PURE__*/ jsx(Flex, {
-                            wrap: true,
-                            justify: "between",
-                            className: "gap-y-5",
-                            children: themeData.map((theme)=>/*#__PURE__*/ jsx(ThemeItem, {
-                                    isSelected: selectedTheme.id === theme.id,
-                                    onClick: ()=>setSelectedTheme(theme),
-                                    ...theme
-                                }, theme.id))
-                        }),
-                        /*#__PURE__*/ jsx(UXDivider, {
-                            className: "my-lg"
+                /*#__PURE__*/ jsx(UXButton, {
+                    fullWidth: true,
+                    isDisabled: 'error' === fontLoadStatus,
+                    size: "lg",
+                    color: "primary",
+                    onPress: handleApplyTheme,
+                    children: i18n.theme.apply
+                })
+            ]
+        }),
+        onOpenChange: handleOpenChange,
+        ...props,
+        children: [
+            /*#__PURE__*/ jsx("div", {
+                className: "grid grid-cols-3 gap-y-5",
+                children: themeData.map((theme)=>/*#__PURE__*/ jsx(ThemeItem, {
+                        isSelected: selectedTheme.id === theme.id,
+                        onClick: ()=>setSelectedTheme(theme),
+                        ...theme
+                    }, theme.id))
+            }),
+            /*#__PURE__*/ jsx(UXDivider, {
+                className: "my-lg"
+            }),
+            /*#__PURE__*/ jsxs(VStack, {
+                gap: "md",
+                children: [
+                    /*#__PURE__*/ jsx(Text, {
+                        body1Bold: true,
+                        children: i18n.theme.font.title
+                    }),
+                    /*#__PURE__*/ jsx(UXInput, {
+                        isClearable: true,
+                        startContent: 'loading' === fontLoadStatus && /*#__PURE__*/ jsx(UXSpinner, {
+                            size: 18
                         }),
-                        /*#__PURE__*/ jsxs(VStack, {
-                            gap: "md",
+                        isInvalid: 'error' === fontLoadStatus,
+                        className: "w-full",
+                        placeholder: i18n.theme.font.placeholder,
+                        value: selectedFontLink,
+                        description: /*#__PURE__*/ jsxs(Fragment, {
                             children: [
-                                /*#__PURE__*/ jsx(Text, {
-                                    body1Bold: true,
-                                    children: i18n.theme.font.title
+                                'success' === fontLoadStatus && /*#__PURE__*/ jsxs(Text, {
+                                    body3Bold: true,
+                                    color: "success",
+                                    children: [
+                                        i18n.theme.font.success,
+                                        fontName
+                                    ]
                                 }),
-                                /*#__PURE__*/ jsx(UXInput, {
-                                    isClearable: true,
-                                    startContent: 'loading' === fontLoadStatus && /*#__PURE__*/ jsx(UXSpinner, {
-                                        size: 18
-                                    }),
-                                    isInvalid: 'error' === fontLoadStatus,
-                                    className: "w-full",
-                                    placeholder: i18n.theme.font.placeholder,
-                                    value: selectedFontLink,
-                                    description: /*#__PURE__*/ jsxs(Fragment, {
-                                        children: [
-                                            'success' === fontLoadStatus && /*#__PURE__*/ jsxs(Text, {
-                                                body3Bold: true,
-                                                color: "success",
-                                                children: [
-                                                    i18n.theme.font.success,
-                                                    fontName
-                                                ]
-                                            }),
-                                            'error' === fontLoadStatus && fontLoadError && /*#__PURE__*/ jsx(Text, {
-                                                body3Bold: true,
-                                                color: "danger",
-                                                children: fontLoadError
-                                            })
-                                        ]
-                                    }),
-                                    onValueChange: setSelectedFontLink
+                                'error' === fontLoadStatus && /*#__PURE__*/ jsx(Text, {
+                                    body3Bold: true,
+                                    color: "danger",
+                                    children: i18n.theme.font.error
                                 })
                             ]
-                        })
-                    ]
-                }),
-                /*#__PURE__*/ jsx(DrawerFooter, {
-                    className: "mb-8",
-                    children: /*#__PURE__*/ jsxs(HStack, {
-                        fullWidth: true,
-                        gap: "lg",
-                        children: [
-                            /*#__PURE__*/ jsx(UXButton, {
-                                fullWidth: true,
-                                size: "lg",
-                                onPress: handleReset,
-                                children: i18n.theme.reset
-                            }),
-                            /*#__PURE__*/ jsx(UXButton, {
-                                fullWidth: true,
-                                isDisabled: 'error' === fontLoadStatus,
-                                size: "lg",
-                                color: "primary",
-                                onPress: handleApplyTheme,
-                                children: i18n.theme.apply
-                            })
-                        ]
+                        }),
+                        onValueChange: setSelectedFontLink
                     })
-                })
-            ]
-        })
+                ]
+            })
+        ]
     });
 };
 const UXThemeSwitch = ({ children })=>{
@@ -132,7 +118,7 @@ const UXThemeSwitch = ({ children })=>{
             isIconOnly: true,
             variant: "light",
             onPress: onOpen,
-            children: /*#__PURE__*/ jsx(ThemeSwitchIcon, {})
+            children: /*#__PURE__*/ jsx(ChartColorSwitchIcon, {})
         });
     };
     return /*#__PURE__*/ jsxs(Fragment, {

package/dist/components/UXThemeSwitch/use-color-scheme.d.ts

@@ -1,5 +1,5 @@
 export declare const useColorScheme: () => {
-    colorScheme: import("./theme-data").ColorScheme;
+    colorScheme: import("@particle-network/ui-shared").ColorScheme;
     isDark: boolean;
     isLight: boolean;
 };

package/dist/components/UXThemeSwitch/use-theme-color.d.ts

@@ -1,19 +1 @@
-export declare const useThemeColor: () => {
-    foreground: string;
-    secondary: string;
-    tertiary: string;
-    primary: string;
-    success: string;
-    danger: string;
-    alert: string;
-    warning: string;
-    gold: string;
-    background: string;
-    'background-200': string;
-    'background-300': string;
-    'background-400': string;
-    overlay: string;
-    divider: string;
-    bullish: string;
-    bearish: string;
-};
+export declare const useThemeColor: () => Record<import("@particle-network/ui-shared").UXColor, string>;

package/dist/components/UXThemeSwitch/use-theme-store.d.ts

@@ -1,4 +1,4 @@
-import { type ThemeItemType } from './theme-data';
+import { type ThemeItemType } from '@particle-network/ui-shared';
 export type FontLoadStatus = 'idle' | 'loading' | 'success' | 'error';
 interface State {
     /**
@@ -25,10 +25,6 @@ interface State {
      * 字体加载状态
      */
     fontLoadStatus: FontLoadStatus;
-    /**
-     * 字体加载错误信息
-     */
-    fontLoadError: string | null;
 }
 interface Actions {
     setSelectedTheme: (theme: ThemeItemType) => void;
@@ -36,7 +32,6 @@ interface Actions {
     setSelectedFontLink: (link: string) => void;
     setSavedFontLink: (link: string) => void;
     setFontLoadStatus: (status: FontLoadStatus) => void;
-    setFontLoadError: (error: string | null) => void;
     setFontName: (name: string) => void;
 }
 type ThemeStore = State & Actions;

package/dist/components/UXThemeSwitch/use-theme-store.js

@@ -1,6 +1,6 @@
+import { themeData } from "@particle-network/ui-shared";
 import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
-import { themeData } from "./theme-data.js";
 const useThemeStore = create()(persist((set)=>({
         selectedTheme: themeData["0"],
         savedTheme: themeData["0"],
@@ -8,7 +8,6 @@ const useThemeStore = create()(persist((set)=>({
         savedFontLink: '',
         fontName: '',
         fontLoadStatus: 'idle',
-        fontLoadError: null,
         setSelectedTheme: (theme)=>set({
                 selectedTheme: theme
             }),
@@ -24,14 +23,11 @@ const useThemeStore = create()(persist((set)=>({
         setFontLoadStatus: (status)=>set({
                 fontLoadStatus: status
             }),
-        setFontLoadError: (error)=>set({
-                fontLoadError: error
-            }),
         setFontName: (name)=>set({
                 fontName: name
             })
     }), {
-    name: 'ux-theme',
+    name: 'ux-theme-1',
     storage: createJSONStorage(()=>'undefined' != typeof window ? window.localStorage : {}),
     partialize: (state)=>({
             selectedTheme: state.selectedTheme,

package/dist/components/UXThemeSwitch/use-theme.d.ts

@@ -1,5 +1,4 @@
-import { type ThemeItemType } from './theme-data';
-import { type FontLoadStatus } from './use-theme-store';
+import { type ThemeItemType } from '@particle-network/ui-shared';
 /**
  * UX 主题管理 Hook
  */
@@ -12,7 +11,6 @@ export declare const useTheme: () => {
     setSelectedFontLink: (link: string) => void;
     savedFontLink: string;
     setSavedFontLink: (link: string) => void;
-    fontLoadStatus: FontLoadStatus;
-    fontLoadError: string | null;
+    fontLoadStatus: import("./use-theme-store").FontLoadStatus;
     fontName: string;
 };

package/dist/components/UXThemeSwitch/use-theme.js

@@ -1,8 +1,19 @@
 import { useEffect } from "react";
+import { themeKeys } from "@particle-network/ui-shared";
 import { useDebounceFn } from "ahooks";
-import { themeKeys } from "./theme-data.js";
 import { useThemeStore } from "./use-theme-store.js";
-const DEFAULT_FONT_FAMILY = 'ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji';
+const DEFAULT_FONT_FAMILY = 'Inter,system-ui,sans-serif,"Microsoft YaHei"';
+const PRELOAD_FONTS_URL = 'https://fonts.googleapis.com/css2?family=Geist:wght@100..900&family=IBM+Plex+Sans:ital,wght@0,100..700;1,100..700&display=swap';
+const preloadFonts = ()=>{
+    if ('undefined' == typeof window) return;
+    const existingLink = document.getElementById('ux-preload-fonts-link');
+    if (existingLink) return;
+    const linkElement = document.createElement('link');
+    linkElement.id = 'ux-preload-fonts-link';
+    linkElement.rel = 'stylesheet';
+    linkElement.href = PRELOAD_FONTS_URL;
+    document.head.appendChild(linkElement);
+};
 const applyTheme = (theme)=>{
     if ('undefined' == typeof window) return;
     const root = document.documentElement;
@@ -11,6 +22,8 @@ const applyTheme = (theme)=>{
     themeKeys.forEach((key)=>{
         root.classList.remove(key);
     });
+    root.classList.remove('dark');
+    root.classList.remove('light');
     root.classList.add(theme.id);
 };
 const extractFontFamilyFromLink = (link)=>{
@@ -19,50 +32,21 @@ const extractFontFamilyFromLink = (link)=>{
         const url = new URL(link);
         const familyParam = url.searchParams.get('family');
         if (!familyParam) return null;
-        const fontName = familyParam.split(':')[0].replace(/\+/g, ' ');
-        return fontName;
+        const firstFamily = familyParam.split('&family=')[0].split(':')[0].replace(/\+/g, ' ');
+        return firstFamily;
     } catch  {
         return null;
     }
 };
-const loadGoogleFont = (link, options)=>{
-    const { setFontLoadStatus, setFontLoadError, setFontName } = options;
+const applyFont = (fontName)=>{
     if ('undefined' == typeof window) return;
-    const existingLink = document.getElementById('ux-google-font-link');
-    if (existingLink) existingLink.remove();
-    if (!link?.trim()) {
+    if (fontName) {
+        document.documentElement.style.setProperty('--ux-font-family', `"${fontName}", ${DEFAULT_FONT_FAMILY}`);
+        document.body.style.fontFamily = `"${fontName}", ${DEFAULT_FONT_FAMILY}`;
+    } else {
         document.documentElement.style.setProperty('--ux-font-family', DEFAULT_FONT_FAMILY);
         document.body.style.fontFamily = DEFAULT_FONT_FAMILY;
-        setFontLoadStatus('idle');
-        setFontLoadError(null);
-        setFontName('');
-        return;
     }
-    setFontLoadStatus('loading');
-    setFontLoadError(null);
-    const linkElement = document.createElement('link');
-    linkElement.id = 'ux-google-font-link';
-    linkElement.rel = 'stylesheet';
-    linkElement.href = link;
-    linkElement.onload = ()=>{
-        setFontLoadStatus('success');
-        setFontLoadError(null);
-        const fontFamily = extractFontFamilyFromLink(link);
-        if (fontFamily) {
-            document.documentElement.style.setProperty('--ux-font-family', `"${fontFamily}", ${DEFAULT_FONT_FAMILY}`);
-            document.body.style.fontFamily = `"${fontFamily}", ${DEFAULT_FONT_FAMILY}`;
-            setFontName(fontFamily);
-        }
-    };
-    linkElement.onerror = ()=>{
-        const errorMessage = '字体加载失败，请检查链接是否正确';
-        setFontLoadStatus('error');
-        setFontLoadError(errorMessage);
-        setFontName('');
-        document.documentElement.style.setProperty('--ux-font-family', DEFAULT_FONT_FAMILY);
-        document.body.style.fontFamily = DEFAULT_FONT_FAMILY;
-    };
-    document.head.appendChild(linkElement);
 };
 const useTheme = ()=>{
     const selectedTheme = useThemeStore((state)=>state.selectedTheme);
@@ -71,24 +55,55 @@ const useTheme = ()=>{
     const savedFontLink = useThemeStore((state)=>state.savedFontLink);
     const fontName = useThemeStore((state)=>state.fontName);
     const fontLoadStatus = useThemeStore((state)=>state.fontLoadStatus);
-    const fontLoadError = useThemeStore((state)=>state.fontLoadError);
     const storeSetSelectedTheme = useThemeStore((state)=>state.setSelectedTheme);
     const storeSetSavedTheme = useThemeStore((state)=>state.setSavedTheme);
     const storeSetSelectedFontLink = useThemeStore((state)=>state.setSelectedFontLink);
     const storeSetSavedFontLink = useThemeStore((state)=>state.setSavedFontLink);
     const storeSetFontLoadStatus = useThemeStore((state)=>state.setFontLoadStatus);
-    const storeSetFontLoadError = useThemeStore((state)=>state.setFontLoadError);
     const storeSetFontName = useThemeStore((state)=>state.setFontName);
-    const { run: debouncedLoadGoogleFont } = useDebounceFn((link)=>loadGoogleFont(link, {
-            setFontLoadStatus: storeSetFontLoadStatus,
-            setFontLoadError: storeSetFontLoadError,
-            setFontName: storeSetFontName
-        }), {
-        wait: 500
+    const applyFontWithStatus = (customFontLink, themeFontName)=>{
+        if ('undefined' == typeof window) return;
+        const isCustomFont = !!customFontLink?.trim();
+        if (!isCustomFont) return void applyFont(themeFontName);
+        const existingLink = document.getElementById('ux-google-font-link');
+        if (existingLink) existingLink.remove();
+        storeSetFontLoadStatus('loading');
+        const linkElement = document.createElement('link');
+        linkElement.id = 'ux-google-font-link';
+        linkElement.rel = 'stylesheet';
+        linkElement.href = customFontLink;
+        linkElement.onload = ()=>{
+            storeSetFontLoadStatus('success');
+            const fontFamily = extractFontFamilyFromLink(customFontLink);
+            if (fontFamily) {
+                applyFont(fontFamily);
+                storeSetFontName(fontFamily);
+            }
+        };
+        linkElement.onerror = ()=>{
+            storeSetFontLoadStatus('error');
+            storeSetFontName('');
+            applyFont(themeFontName);
+        };
+        document.head.appendChild(linkElement);
+    };
+    const { run: debouncedApplyFont } = useDebounceFn((customFontLink, themeFontName)=>applyFontWithStatus(customFontLink, themeFontName), {
+        wait: 300
     });
+    useEffect(()=>{
+        preloadFonts();
+    }, []);
+    useEffect(()=>{
+        if (!selectedFontLink.trim()) {
+            storeSetFontLoadStatus('idle');
+            storeSetFontName('');
+        }
+    }, [
+        selectedFontLink
+    ]);
     useEffect(()=>{
         applyTheme(savedTheme);
-        debouncedLoadGoogleFont(savedFontLink);
+        debouncedApplyFont(savedFontLink, savedTheme.fontName);
     }, [
         savedTheme,
         savedFontLink
@@ -96,6 +111,7 @@ const useTheme = ()=>{
     const setSelectedTheme = (theme)=>{
         storeSetSelectedTheme(theme);
         applyTheme(theme);
+        debouncedApplyFont(selectedFontLink, theme.fontName);
     };
     const setSavedTheme = (theme)=>{
         storeSetSavedTheme(theme);
@@ -103,11 +119,11 @@ const useTheme = ()=>{
     };
     const setSelectedFontLink = (link)=>{
         storeSetSelectedFontLink(link);
-        debouncedLoadGoogleFont(link);
+        debouncedApplyFont(link, selectedTheme.fontName);
     };
     const setSavedFontLink = (link)=>{
         storeSetSavedFontLink(link);
-        debouncedLoadGoogleFont(link);
+        debouncedApplyFont(link, savedTheme.fontName);
     };
     return {
         selectedTheme,
@@ -119,7 +135,6 @@ const useTheme = ()=>{
         savedFontLink,
         setSavedFontLink,
         fontLoadStatus,
-        fontLoadError,
         fontName
     };
 };

package/dist/components/UXToast/index.d.ts

@@ -1,13 +1,16 @@
+import type { ReactNode } from 'react';
 import type { ToastProps } from '@heroui/toast';
-export type UXToastType = 'success' | 'error' | 'loading';
+export { addToast, closeAll, closeToast, getToastQueue, isToastClosing } from '@heroui/toast';
+export type UXToastType = 'success' | 'error' | 'loading' | 'info';
 export type UXToastProps = Partial<ToastProps> & {
     type: UXToastType;
 };
 export declare const UXToastProvider: () => import("react/jsx-runtime").JSX.Element;
 export declare const toast: {
-    success: (message: string, props?: Partial<ToastProps>) => string | null;
-    error: (message: string, props?: Partial<ToastProps>) => string | null;
-    loading: (message: string, props?: Partial<ToastProps>) => string | null;
+    info: (message: ReactNode, props?: Partial<ToastProps>) => string | null;
+    success: (message: ReactNode, props?: Partial<ToastProps>) => string | null;
+    error: (message: ReactNode, props?: Partial<ToastProps>) => string | null;
+    loading: (message: ReactNode, props?: Partial<ToastProps>) => string | null;
     show: (props?: Partial<ToastProps> & {
         type: UXToastType;
     }) => string | null;