@taicode/common-web 1.1.21 → 3.0.1

package/output/loading-button/index.d.ts

@@ -1,26 +1,44 @@
-import React from 'react';
-import { type ButtonProps } from '../catalyst/button';
+import React, { ComponentPropsWithoutRef, ElementType } from 'react';
 /**
- * LoadingButton 组件属性类型
- * 继承 Button 的所有属性，自动处理 onClick 的异步状态
+ * 多态组件的 Props 类型
  */
-export type LoadingButtonProps = ButtonProps;
+type PolymorphicProps<T extends ElementType> = {
+    as?: T;
+    loading?: boolean;
+    loadingText?: string;
+    loadingIcon?: React.ReactNode;
+    onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void | Promise<void>;
+    disabled?: boolean;
+    children?: React.ReactNode;
+} & Omit<ComponentPropsWithoutRef<T>, 'as' | 'loading' | 'loadingText' | 'loadingIcon' | 'onClick'>;
 /**
  * LoadingButton 组件
  *
- * 自动处理 onClick 异步操作的加载状态，在按钮末尾显示 loading 图标
+ * 支持任意组件作为基础按钮，在异步操作时自动显示 loading 状态
  *
  * @example
  * ```tsx
- * <LoadingButton
- *   color="blue"
- *   onClick={async () => {
- *     await saveData()
- *   }}
- * >
+ * // 使用默认 button
+ * <LoadingButton onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 使用自定义组件
+ * <LoadingButton as={MyButton} onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 自定义 loading 图标
+ * <LoadingButton loadingIcon={<MySpinner />} onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 手动控制 loading 状态
+ * <LoadingButton loading={isLoading}>
  *   保存
  * </LoadingButton>
  * ```
  */
-export declare const LoadingButton: React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLElement>>;
+export declare const LoadingButton: React.ForwardRefExoticComponent<Omit<PolymorphicProps<React.ElementType>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/output/loading-button/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/loading-button/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAA;AACnD,OAAO,EAAU,KAAK,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAG7D;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAA;AAM5C;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,aAAa,iFAkDxB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/loading-button/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAqC,wBAAwB,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAkCvG;;GAEG;AACH,KAAK,gBAAgB,CAAC,CAAC,SAAS,WAAW,IAAI;IAC7C,EAAE,CAAC,EAAE,CAAC,CAAA;IACN,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC7B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC9E,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC,CAAA;AAEnG;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,aAAa,4HAsEzB,CAAA"}

package/output/loading-button/index.js

@@ -9,47 +9,71 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef, useState } from 'react';
-import { Button } from '../catalyst/button';
-import { catchIt } from '@taicode/common-base';
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useState, useCallback, forwardRef } from 'react';
 function isPromiseLike(value) {
-    return value != null && typeof value.then === 'function';
+    return value != null && typeof value === 'object' && 'then' in value && typeof value.then === 'function';
+}
+/**
+ * Loading 指示器组件
+ */
+function LoadingSpinner({ className = '' }) {
+    return (_jsxs("svg", { className: `animate-spin ${className}`, xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24", children: [_jsx("circle", { className: "opacity-25", cx: "12", cy: "12", r: "10", stroke: "currentColor", strokeWidth: "4" }), _jsx("path", { className: "opacity-75", fill: "currentColor", d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" })] }));
 }
 /**
  * LoadingButton 组件
  *
- * 自动处理 onClick 异步操作的加载状态，在按钮末尾显示 loading 图标
+ * 支持任意组件作为基础按钮，在异步操作时自动显示 loading 状态
  *
  * @example
  * ```tsx
- * <LoadingButton
- *   color="blue"
- *   onClick={async () => {
- *     await saveData()
- *   }}
- * >
+ * // 使用默认 button
+ * <LoadingButton onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 使用自定义组件
+ * <LoadingButton as={MyButton} onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 自定义 loading 图标
+ * <LoadingButton loadingIcon={<MySpinner />} onClick={async () => await save()}>
+ *   保存
+ * </LoadingButton>
+ *
+ * // 手动控制 loading 状态
+ * <LoadingButton loading={isLoading}>
  *   保存
  * </LoadingButton>
  * ```
  */
 export const LoadingButton = forwardRef(function LoadingButton(_a, ref) {
-    var { children, onClick } = _a, props = __rest(_a, ["children", "onClick"]);
-    const [isLoading, setIsLoading] = useState(false);
-    const handleClick = async (event) => {
-        if (!onClick || isLoading)
+    var { as, loading: externalLoading, loadingText, loadingIcon, onClick, disabled, children, className = '' } = _a, props = __rest(_a, ["as", "loading", "loadingText", "loadingIcon", "onClick", "disabled", "children", "className"]);
+    const [internalLoading, setInternalLoading] = useState(false);
+    const loading = externalLoading !== null && externalLoading !== void 0 ? externalLoading : internalLoading;
+    const handleClick = useCallback((event) => {
+        if (!onClick || loading || disabled)
             return;
         const result = onClick(event);
-        // 检查是否是 Promise
+        // 如果返回 Promise-like，自动管理 loading 状态，但不捕获异常
+        // 使用 then 而不是 finally，因为 PromiseLike 不保证有 finally 方法
+        // 在 rejected 回调中重新抛出，让异常传播到全局错误处理机制（如 Toaster）
         if (isPromiseLike(result)) {
-            setIsLoading(true);
-            const catchResult = await catchIt(result);
-            setIsLoading(false);
-            // 错误由调用方处理
-            if (catchResult.isError()) {
-                throw catchResult.error;
-            }
+            setInternalLoading(true);
+            result.then(() => setInternalLoading(false), (error) => {
+                setInternalLoading(false);
+                throw error;
+            });
         }
-    };
-    return (_jsxs(Button, Object.assign({}, props, { ref: ref, onClick: handleClick, disabled: isLoading, children: [children, isLoading && (_jsxs("svg", { "data-slot": "icon", className: "animate-spin", viewBox: "0 0 24 24", fill: "none", children: [_jsx("circle", { className: "opacity-25", cx: "12", cy: "12", r: "10", stroke: "currentColor", strokeWidth: "4" }), _jsx("path", { className: "opacity-75", fill: "currentColor", d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" })] }))] })));
+    }, [onClick, loading, disabled]);
+    // 使用 as prop 或默认 button
+    const Component = as || 'button';
+    // 默认 button 样式（仅当使用默认 button 时应用）
+    const defaultButtonClass = !as
+        ? 'inline-flex items-center justify-center gap-2 rounded-[var(--radius)] bg-[var(--primary)] px-4 py-2 text-sm font-medium text-[var(--primary-foreground)] shadow-sm transition-opacity hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-[var(--ring)] focus:ring-offset-2 disabled:opacity-50 disabled:cursor-not-allowed'
+        : '';
+    const finalClassName = `${defaultButtonClass} ${className}`.trim();
+    return (_jsx(Component, Object.assign({ ref: ref, onClick: handleClick, disabled: disabled || loading, className: finalClassName }, props, { children: loading ? (_jsxs(_Fragment, { children: [loadingIcon || _jsx(LoadingSpinner, { className: "size-4" }), loadingText || children] })) : (children) })));
 });
+LoadingButton.displayName = 'LoadingButton';

package/output/loading-button/index.test.d.ts

@@ -0,0 +1,2 @@
+import '@testing-library/jest-dom/vitest';
+//# sourceMappingURL=index.test.d.ts.map

package/output/loading-button/index.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../source/loading-button/index.test.tsx"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAA"}

package/output/loading-button/index.test.js

@@ -0,0 +1,203 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import '@testing-library/jest-dom/vitest';
+import { describe, it, expect, vi } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { LoadingButton } from './index';
+describe('LoadingButton', () => {
+    describe('基础功能', () => {
+        it('应该渲染按钮和子元素', () => {
+            render(_jsx(LoadingButton, { children: "\u70B9\u51FB\u6211" }));
+            expect(screen.getByRole('button')).toHaveTextContent('点击我');
+        });
+        it('应该支持 disabled 属性', () => {
+            render(_jsx(LoadingButton, { disabled: true, children: "\u70B9\u51FB\u6211" }));
+            expect(screen.getByRole('button')).toBeDisabled();
+        });
+        it('应该应用自定义 className', () => {
+            render(_jsx(LoadingButton, { className: "custom-class", children: "\u70B9\u51FB\u6211" }));
+            expect(screen.getByRole('button')).toHaveClass('custom-class');
+        });
+    });
+    describe('同步点击', () => {
+        it('应该处理同步点击事件', () => {
+            const handleClick = vi.fn();
+            render(_jsx(LoadingButton, { onClick: handleClick, children: "\u70B9\u51FB\u6211" }));
+            fireEvent.click(screen.getByRole('button'));
+            expect(handleClick).toHaveBeenCalledTimes(1);
+        });
+        it('同步操作不应该显示 loading', () => {
+            const handleClick = vi.fn();
+            render(_jsx(LoadingButton, { onClick: handleClick, children: "\u70B9\u51FB\u6211" }));
+            fireEvent.click(screen.getByRole('button'));
+            expect(screen.queryByRole('button')).toHaveTextContent('点击我');
+        });
+    });
+    describe('异步点击', () => {
+        it('应该在异步操作期间显示 loading', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise(resolve => setTimeout(resolve, 100));
+            });
+            render(_jsx(LoadingButton, { children: "\u4FDD\u5B58" }));
+            const button = screen.getByRole('button');
+            fireEvent.click(button);
+            // 应该立即显示 loading
+            await waitFor(() => {
+                expect(button).toBeDisabled();
+            });
+            // 等待异步操作完成
+            await waitFor(() => {
+                expect(button).not.toBeDisabled();
+            }, { timeout: 200 });
+        });
+        it('异步操作完成后应该恢复正常状态', async () => {
+            let resolve;
+            const promise = new Promise(r => { resolve = r; });
+            const handleClick = vi.fn(() => promise);
+            render(_jsx(LoadingButton, { onClick: handleClick, children: "\u4FDD\u5B58" }));
+            const button = screen.getByRole('button');
+            fireEvent.click(button);
+            // loading 状态
+            await waitFor(() => {
+                expect(button).toBeDisabled();
+            });
+            // 完成异步操作
+            resolve();
+            // 恢复正常
+            await waitFor(() => {
+                expect(button).not.toBeDisabled();
+            });
+        });
+        it('异步操作失败后应该恢复正常状态', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise((_, reject) => setTimeout(() => reject(new Error('失败')), 50));
+            });
+            render(_jsx(LoadingButton, { onClick: handleClick, children: "\u4FDD\u5B58" }));
+            const button = screen.getByRole('button');
+            fireEvent.click(button);
+            // loading 状态
+            await waitFor(() => {
+                expect(button).toBeDisabled();
+            });
+            // 等待失败并恢复
+            await waitFor(() => {
+                expect(button).not.toBeDisabled();
+            }, { timeout: 100 });
+        });
+    });
+    describe('手动控制 loading', () => {
+        it('应该支持外部控制 loading 状态', () => {
+            const { rerender } = render(_jsx(LoadingButton, { loading: false, children: "\u4FDD\u5B58" }));
+            expect(screen.getByRole('button')).not.toBeDisabled();
+            rerender(_jsx(LoadingButton, { loading: true, children: "\u4FDD\u5B58" }));
+            expect(screen.getByRole('button')).toBeDisabled();
+        });
+        it('外部 loading 状态应该优先于内部状态', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise(resolve => setTimeout(resolve, 100));
+            });
+            render(_jsx(LoadingButton, { loading: true, onClick: handleClick, children: "\u4FDD\u5B58" }));
+            const button = screen.getByRole('button');
+            // 外部 loading 为 true，应该禁用
+            expect(button).toBeDisabled();
+            // 点击不应该触发
+            fireEvent.click(button);
+            expect(handleClick).not.toHaveBeenCalled();
+        });
+    });
+    describe('loading 显示定制', () => {
+        it('应该显示自定义 loadingText', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise(resolve => setTimeout(resolve, 50));
+            });
+            render(_jsx(LoadingButton, { loadingText: "\u5904\u7406\u4E2D...", onClick: handleClick, children: "\u4FDD\u5B58" }));
+            fireEvent.click(screen.getByRole('button'));
+            await waitFor(() => {
+                expect(screen.getByText('处理中...')).toBeInTheDocument();
+            });
+        });
+        it('应该显示自定义 loadingIcon', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise(resolve => setTimeout(resolve, 50));
+            });
+            render(_jsx(LoadingButton, { loadingIcon: _jsx("span", { "data-testid": "custom-icon", children: "\u23F3" }), onClick: handleClick, children: "\u4FDD\u5B58" }));
+            fireEvent.click(screen.getByRole('button'));
+            await waitFor(() => {
+                expect(screen.getByTestId('custom-icon')).toBeInTheDocument();
+            });
+        });
+    });
+    describe('多态组件 (as prop)', () => {
+        it('应该渲染为自定义组件', () => {
+            const CustomButton = (_a) => {
+                var { children } = _a, props = __rest(_a, ["children"]);
+                return (_jsx("button", Object.assign({ "data-testid": "custom-button" }, props, { children: children })));
+            };
+            render(_jsx(LoadingButton, { as: CustomButton, children: "\u70B9\u51FB\u6211" }));
+            expect(screen.getByTestId('custom-button')).toBeInTheDocument();
+        });
+        it('应该渲染为 anchor 标签', () => {
+            render(_jsx(LoadingButton, { as: "a", href: "#", children: "\u94FE\u63A5" }));
+            const link = screen.getByText('链接');
+            expect(link.tagName).toBe('A');
+        });
+        it('自定义组件应该保留其 props', () => {
+            render(_jsx(LoadingButton, { as: "a", href: "https://example.com", target: "_blank", children: "\u94FE\u63A5" }));
+            const link = screen.getByText('链接');
+            expect(link).toHaveAttribute('href', 'https://example.com');
+            expect(link).toHaveAttribute('target', '_blank');
+        });
+    });
+    describe('禁用状态', () => {
+        it('禁用时不应该触发点击', () => {
+            const handleClick = vi.fn();
+            render(_jsx(LoadingButton, { disabled: true, onClick: handleClick, children: "\u70B9\u51FB\u6211" }));
+            fireEvent.click(screen.getByRole('button'));
+            expect(handleClick).not.toHaveBeenCalled();
+        });
+        it('loading 时不应该触发点击', async () => {
+            const handleClick = vi.fn(async () => {
+                await new Promise(resolve => setTimeout(resolve, 100));
+            });
+            render(_jsx(LoadingButton, { onClick: handleClick, children: "\u4FDD\u5B58" }));
+            const button = screen.getByRole('button');
+            // 第一次点击
+            fireEvent.click(button);
+            expect(handleClick).toHaveBeenCalledTimes(1);
+            // loading 期间再次点击
+            fireEvent.click(button);
+            fireEvent.click(button);
+            // 不应该再次触发
+            expect(handleClick).toHaveBeenCalledTimes(1);
+            // 等待完成
+            await waitFor(() => {
+                expect(button).not.toBeDisabled();
+            }, { timeout: 150 });
+        });
+    });
+    describe('默认样式', () => {
+        it('使用默认 button 时应该应用默认样式', () => {
+            render(_jsx(LoadingButton, { children: "\u70B9\u51FB\u6211" }));
+            const button = screen.getByRole('button');
+            // 检查是否包含默认样式类
+            expect(button.className).toContain('inline-flex');
+            expect(button.className).toContain('bg-primary');
+        });
+        it('使用 as prop 时不应该应用默认样式', () => {
+            render(_jsx(LoadingButton, { as: "a", children: "\u94FE\u63A5" }));
+            const link = screen.getByText('链接');
+            // 不应该包含默认 button 样式
+            expect(link.className).not.toContain('bg-primary');
+        });
+    });
+});

package/output/signin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/signin/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAczB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIxC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,YAAY,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,eAAe;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,cAAc;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AA+UD;;;GAGG;AACH,UAAU,yBAAyB;IACjC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,yBAAyB;IACzB,IAAI,EAAE,SAAS,CAAA;IACf,mBAAmB;IACnB,KAAK,CAAC,EAAE,iBAAiB,CAAA;CAC1B;AAED,eAAO,MAAM,oBAAoB,WAAoB,yBAAyB;;CAmC5E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/signin/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAIxC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAGrC,YAAY,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,SAAS,CAAA;AAEhB;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,cAAc;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,aAAa;IACb,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,sBAAsB;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,eAAe;IACf,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,cAAc;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe;IACf,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAwWD;;;GAGG;AACH,UAAU,yBAAyB;IACjC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,yBAAyB;IACzB,IAAI,EAAE,SAAS,CAAA;IACf,mBAAmB;IACnB,KAAK,CAAC,EAAE,iBAAiB,CAAA;CAC1B;AAED,eAAO,MAAM,oBAAoB,WAAoB,yBAAyB;;CAmC5E,CAAA"}

package/output/signin/index.js

@@ -1,10 +1,20 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { observer } from 'mobx-react-lite';
 import { motion, AnimatePresence } from 'framer-motion';
+import * as DialogPrimitive from '@radix-ui/react-dialog';
 import { CheckCircleIcon, XCircleIcon, ExclamationTriangleIcon, ClockIcon } from '@heroicons/react/24/outline';
-import { Dialog, DialogBody } from '../catalyst/dialog';
-import { Button } from '../catalyst/button';
 import { SigninService } from './service';
 import { SigninContext } from './context';
 import { ServiceProvider } from '../service';
@@ -31,6 +41,14 @@ const defaultTexts = {
     cancelButton: '取消',
     closeButton: '关闭'
 };
+const Button = (_a) => {
+    var { variant = 'primary', className = '', children } = _a, props = __rest(_a, ["variant", "className", "children"]);
+    const baseStyles = 'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-[var(--radius)] text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--ring)] focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 h-10 px-4 py-2';
+    const variantStyles = variant === 'primary'
+        ? 'bg-[var(--primary)] text-[var(--primary-foreground)] hover:opacity-90'
+        : 'border border-[var(--input)] bg-[var(--background)] hover:bg-[var(--accent)] hover:text-[var(--accent-foreground)]';
+    return (_jsx("button", Object.assign({ className: `${baseStyles} ${variantStyles} ${className}` }, props, { children: children })));
+};
 const SigninDialog = observer((props) => {
     const { service, texts } = props;
     // 禁止关闭弹窗，防止用户误操作
@@ -70,28 +88,28 @@ const SigninDialog = observer((props) => {
     const OpeningState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsxs("div", { className: "relative flex items-center justify-center mb-8", children: [_jsx(motion.div, { className: "absolute size-16 rounded-full border-4 border-transparent border-t-emerald-600 border-r-emerald-600", animate: { rotate: 360 }, transition: { duration: 1, repeat: Infinity, ease: 'linear' } }), _jsx(motion.div, { className: "absolute size-12 rounded-full border-4 border-transparent border-b-emerald-400 border-l-emerald-400", animate: { rotate: -360 }, transition: { duration: 1.5, repeat: Infinity, ease: 'linear' } }), _jsx(motion.div, { className: "size-3 rounded-full bg-emerald-600", animate: {
                             scale: [1, 1.2, 1],
                             opacity: [1, 0.7, 1]
-                        }, transition: { duration: 1, repeat: Infinity } })] }), _jsx(motion.p, { initial: { opacity: 0 }, animate: { opacity: 1 }, transition: { delay: 0.1 }, className: "text-base font-semibold text-slate-900 dark:text-slate-100", children: texts.openingDescription }), _jsxs(motion.div, { initial: { opacity: 0, y: 10 }, animate: { opacity: 1, y: 0 }, transition: { delay: 0.2 }, className: "mt-2 flex gap-2", children: [_jsx(Button, { color: "emerald", onClick: handleReopenWindow, children: texts.reopenButton }), _jsx(Button, { outline: true, onClick: handleCancel, children: texts.cancelButton })] })] }, "opening"));
+                        }, transition: { duration: 1, repeat: Infinity } })] }), _jsx(motion.p, { initial: { opacity: 0 }, animate: { opacity: 1 }, transition: { delay: 0.1 }, className: "text-base font-semibold text-[var(--foreground)]", children: texts.openingDescription }), _jsxs(motion.div, { initial: { opacity: 0, y: 10 }, animate: { opacity: 1, y: 0 }, transition: { delay: 0.2 }, className: "mt-2 flex gap-2", children: [_jsx(Button, { variant: "primary", onClick: handleReopenWindow, children: texts.reopenButton }), _jsx(Button, { variant: "outline", onClick: handleCancel, children: texts.cancelButton })] })] }, "opening"));
     /**
      * Waiting 状态 - 等待用户登录
      */
-    const WaitingState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsxs("div", { className: "relative mb-2", children: [_jsx(motion.div, { className: "size-16 rounded-full border-4 border-emerald-200 dark:border-emerald-900", animate: { scale: [1, 1.1, 1] }, transition: { duration: 2, repeat: Infinity } }), _jsx(motion.div, { className: "absolute inset-0 size-16 rounded-full border-4 border-emerald-400", animate: { scale: [1, 1.3, 1], opacity: [0.75, 0, 0.75] }, transition: { duration: 2, repeat: Infinity } }), _jsx(motion.svg, { className: "absolute inset-0 m-auto size-8 text-emerald-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1 }, children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" }) })] }), _jsx("p", { className: "text-base font-semibold text-slate-900 dark:text-slate-100", children: texts.waitingDescription }), _jsx("p", { className: "text-xs text-slate-500 dark:text-slate-500", children: texts.waitingHint }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { color: "emerald", onClick: handleReopenWindow, children: texts.reopenButton }), _jsx(Button, { outline: true, onClick: handleCancel, children: texts.cancelButton })] })] }, "waiting"));
+    const WaitingState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsxs("div", { className: "relative mb-2", children: [_jsx(motion.div, { className: "size-16 rounded-full border-4 border-emerald-200 dark:border-emerald-900", animate: { scale: [1, 1.1, 1] }, transition: { duration: 2, repeat: Infinity } }), _jsx(motion.div, { className: "absolute inset-0 size-16 rounded-full border-4 border-emerald-400", animate: { scale: [1, 1.3, 1], opacity: [0.75, 0, 0.75] }, transition: { duration: 2, repeat: Infinity } }), _jsx(motion.svg, { className: "absolute inset-0 m-auto size-8 text-emerald-600", fill: "none", viewBox: "0 0 24 24", stroke: "currentColor", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1 }, children: _jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", strokeWidth: 2, d: "M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" }) })] }), _jsx("p", { className: "text-base font-semibold text-[var(--foreground)]", children: texts.waitingDescription }), _jsx("p", { className: "text-xs text-[var(--muted-foreground)]", children: texts.waitingHint }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { variant: "primary", onClick: handleReopenWindow, children: texts.reopenButton }), _jsx(Button, { variant: "outline", onClick: handleCancel, children: texts.cancelButton })] })] }, "waiting"));
     /**
      * Success 状态 - 登录成功
      */
-    const SuccessState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.5 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.5 }, transition: { duration: 0.3, type: 'spring' }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring', stiffness: 200 }, children: _jsx(CheckCircleIcon, { className: "size-16 text-emerald-600 dark:text-emerald-400" }) }), _jsx(motion.p, { initial: { opacity: 0, y: 10 }, animate: { opacity: 1, y: 0 }, transition: { delay: 0.2 }, className: "text-base font-semibold text-emerald-600 dark:text-emerald-400", children: texts.successDescription })] }, "success"));
+    const SuccessState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.5 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.5 }, transition: { duration: 0.3, type: 'spring' }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring', stiffness: 200 }, children: _jsx(CheckCircleIcon, { className: "size-16 text-emerald-600 dark:text-emerald-400" }) }), _jsx(motion.p, { initial: { opacity: 0, y: 10 }, animate: { opacity: 1, y: 0 }, transition: { delay: 0.2 }, className: "text-base font-semibold text-[var(--primary)]", children: texts.successDescription })] }, "success"));
     /**
      * Error 状态 - 登录失败
      */
-    const ErrorState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1, rotate: [0, -10, 10, -10, 0] }, transition: { scale: { delay: 0.1 }, rotate: { delay: 0.2, duration: 0.5 } }, children: _jsx(XCircleIcon, { className: "size-16 text-red-600 dark:text-red-400" }) }), _jsx("p", { className: "text-base font-semibold text-red-600 dark:text-red-400", children: service.errorMessage || texts.errorDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { color: "emerald", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { outline: true, onClick: handleClose, children: texts.closeButton })] })] }, "error"));
+    const ErrorState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1, rotate: [0, -10, 10, -10, 0] }, transition: { scale: { delay: 0.1 }, rotate: { delay: 0.2, duration: 0.5 } }, children: _jsx(XCircleIcon, { className: "size-16 text-red-600 dark:text-red-400" }) }), _jsx("p", { className: "text-base font-semibold text-[var(--destructive)]", children: service.errorMessage || texts.errorDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { variant: "primary", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { variant: "outline", onClick: handleClose, children: texts.closeButton })] })] }, "error"));
     /**
      * Cancelled 状态 - 用户取消登录
      */
-    const CancelledState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring' }, children: _jsx(ExclamationTriangleIcon, { className: "size-16 text-amber-600 dark:text-amber-400" }) }), _jsx("p", { className: "text-base font-semibold text-amber-600 dark:text-amber-400", children: texts.cancelledDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { color: "emerald", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { outline: true, onClick: handleClose, children: texts.closeButton })] })] }, "cancelled"));
+    const CancelledState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring' }, children: _jsx(ExclamationTriangleIcon, { className: "size-16 text-amber-600 dark:text-amber-400" }) }), _jsx("p", { className: "text-base font-semibold text-[var(--muted-foreground)]", children: texts.cancelledDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { variant: "primary", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { variant: "outline", onClick: handleClose, children: texts.closeButton })] })] }, "cancelled"));
     /**
      * Expired 状态 - 票据过期
      */
-    const ExpiredState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring' }, children: _jsx(ClockIcon, { className: "size-16 text-orange-600 dark:text-orange-400" }) }), _jsx("p", { className: "text-base font-semibold text-orange-600 dark:text-orange-400", children: texts.expiredDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { color: "emerald", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { outline: true, onClick: handleClose, children: texts.closeButton })] })] }, "expired"));
-    return (_jsx(Dialog, { open: service.isDialogOpen, onClose: preventClose, children: _jsx(DialogBody, { children: _jsx("div", { className: "flex flex-col items-center justify-center py-8", children: _jsxs(AnimatePresence, { mode: "wait", children: [service.dialogStatus === 'opening' && _jsx(OpeningState, {}), service.dialogStatus === 'waiting' && _jsx(WaitingState, {}), service.dialogStatus === 'success' && _jsx(SuccessState, {}), service.dialogStatus === 'error' && _jsx(ErrorState, {}), service.dialogStatus === 'cancelled' && _jsx(CancelledState, {}), service.dialogStatus === 'expired' && _jsx(ExpiredState, {})] }) }) }) }));
+    const ExpiredState = () => (_jsxs(motion.div, { initial: { opacity: 0, scale: 0.9 }, animate: { opacity: 1, scale: 1 }, exit: { opacity: 0, scale: 0.9 }, transition: { duration: 0.2 }, className: "flex flex-col items-center gap-4", children: [_jsx(motion.div, { className: "mb-2", initial: { scale: 0 }, animate: { scale: 1 }, transition: { delay: 0.1, type: 'spring' }, children: _jsx(ClockIcon, { className: "size-16 text-orange-600 dark:text-orange-400" }) }), _jsx("p", { className: "text-base font-semibold text-[var(--muted-foreground)]", children: texts.expiredDescription }), _jsxs("div", { className: "mt-2 flex gap-2", children: [_jsx(Button, { variant: "primary", onClick: handleRetry, children: texts.retryButton }), _jsx(Button, { variant: "outline", onClick: handleClose, children: texts.closeButton })] })] }, "expired"));
+    return (_jsx(DialogPrimitive.Root, { open: service.isDialogOpen, onOpenChange: (open) => !open && preventClose(), children: _jsxs(DialogPrimitive.Portal, { children: [_jsx(DialogPrimitive.Overlay, { className: "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0" }), _jsx(DialogPrimitive.Content, { className: "fixed left-[50%] top-[50%] z-50 w-full max-w-md translate-x-[-50%] translate-y-[-50%] border border-[var(--border)] bg-[var(--background)] p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] rounded-[var(--radius)]", children: _jsx("div", { className: "flex flex-col items-center justify-center py-8", children: _jsxs(AnimatePresence, { mode: "wait", children: [service.dialogStatus === 'opening' && _jsx(OpeningState, {}), service.dialogStatus === 'waiting' && _jsx(WaitingState, {}), service.dialogStatus === 'success' && _jsx(SuccessState, {}), service.dialogStatus === 'error' && _jsx(ErrorState, {}), service.dialogStatus === 'cancelled' && _jsx(CancelledState, {}), service.dialogStatus === 'expired' && _jsx(ExpiredState, {})] }) }) })] }) }));
 });
 export const SigninDialogProvider = observer((props) => {
     const { children, apis: apiConfig, texts: customTexts } = props;

package/output/signin/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../source/signin/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAsB,MAAM,sBAAsB,CAAA;AAElE,OAAO,KAAK,EAAE,SAAS,EAAwC,YAAY,EAAE,MAAM,SAAS,CAAA;AAE5F,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,CAAA;AAE/G;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,6BAA6B;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,6BAA6B;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAA;CAChC;AAoBD,qBAAa,aAAc,SAAQ,OAAO;IACxC,SACgB,MAAM,EAAE,OAAO,CAAQ;IAEvC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IACtD,OAAO,CAAC,YAAY,CAA6C;IAGjE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAGxD,SACgB,YAAY,EAAE,kBAAkB,CAAS;IAEzD,SACgB,YAAY,EAAE,MAAM,CAAK;gBAE7B,SAAS,EAAE,SAAS,EAAE,MAAM,GAAE,mBAAwB;IAMlE,IACW,MAAM,IAAI,YAAY,GAAG,IAAI,CAIvC;IAED,IACW,SAAS,IAAI,MAAM,GAAG,IAAI,CAEpC;IAED,IACW,YAAY,IAAI,OAAO,CAEjC;IAED,IACW,eAAe,IAAI,OAAO,CAEpC;IAED;;OAEG;IACH,OAAO,CAAC,eAAe;IAKvB;;OAEG;IACH,OAAO,CAAC,SAAS;IAgBjB;;OAEG;IACH,OAAO,CAAC,YAAY;IAuCpB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,WAAW;IAQnB;;OAEG;YACW,iBAAiB;IAyB/B;;OAEG;YACW,iBAAiB;IA4G/B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;OAEG;IAEG,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA+CrC;;OAEG;IAEG,WAAW;IASjB;;OAEG;IAEG,MAAM;IAqBZ;;OAEG;IAEU,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IA2BrC;;OAEG;IACH,OAAO,CAAC,OAAO;IAWf;;OAEG;IACI,OAAO;CAIf"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../source/signin/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAsB,MAAM,sBAAsB,CAAA;AAElE,OAAO,KAAK,EAAE,SAAS,EAAwC,YAAY,EAAE,MAAM,SAAS,CAAA;AAE5F,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,CAAA;AAE/G;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,2BAA2B;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,6BAA6B;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,6BAA6B;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAA;CAChC;AAoBD,qBAAa,aAAc,SAAQ,OAAO;IACxC,SACgB,MAAM,EAAE,OAAO,CAAQ;IAEvC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;IACtD,OAAO,CAAC,YAAY,CAA6C;IAGjE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAGvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IAGxD,SACgB,YAAY,EAAE,kBAAkB,CAAS;IAEzD,SACgB,YAAY,EAAE,MAAM,CAAK;gBAE7B,SAAS,EAAE,SAAS,EAAE,MAAM,GAAE,mBAAwB;IAMlE,IACW,MAAM,IAAI,YAAY,GAAG,IAAI,CAIvC;IAED,IACW,SAAS,IAAI,MAAM,GAAG,IAAI,CAEpC;IAED,IACW,YAAY,IAAI,OAAO,CAEjC;IAED,IACW,eAAe,IAAI,OAAO,CAEpC;IAED;;OAEG;IACH,OAAO,CAAC,eAAe;IAKvB;;OAEG;IACH,OAAO,CAAC,SAAS;IAgBjB;;OAEG;IACH,OAAO,CAAC,YAAY;IAuCpB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,QAAQ;IAehB;;OAEG;IACH,OAAO,CAAC,WAAW;IAQnB;;OAEG;YACW,iBAAiB;IAyB/B;;OAEG;YACW,iBAAiB;IA4G/B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;OAEG;IAEG,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA+CrC;;OAEG;IAEG,WAAW;IASjB;;OAEG;IAEG,MAAM;IAqBZ;;OAEG;IAEU,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC;IA6BrC;;OAEG;IACH,OAAO,CAAC,OAAO;IAWf;;OAEG;IACI,OAAO;CAIf"}

package/output/signin/service.js

@@ -445,10 +445,13 @@ let SigninService = (() => {
                     dialogStatus: this.dialogStatus,
                     errorMessage: this.errorMessage
                 }), () => {
-                    // 只在有活跃票据或等待状态时保存
-                    if (this.ticket || this.dialogStatus !== 'idle') {
+                    // 只在需要恢复的状态时保存（等待或打开中且有有效票据）
+                    if (this.ticket && (this.dialogStatus === 'waiting' || this.dialogStatus === 'opening')) {
                         this.saveState();
                     }
+                    else {
+                        this.clearPersistedState();
+                    }
                 }, { delay: 100 }));
                 // 尝试恢复持久化状态
                 const restored = this.restoreState();

package/output/signin/service.test.js

@@ -150,8 +150,10 @@ describe('SigninService', () => {
             await service.start();
             // 等待状态保存
             await new Promise(resolve => setTimeout(resolve, 150));
-            // 模拟页面刷新 - 销毁旧服务
+            // 模拟页面刷新 - 保存 localStorage（浏览器刷新时不会调用 dispose，但会保留 localStorage）
+            const savedData = localStorageMock.getItem('__signin_service_state__');
             service.dispose();
+            localStorageMock.setItem('__signin_service_state__', savedData);
             // 创建新服务实例（模拟页面重新加载）
             const newService = new SigninService(mockApi, {
                 pollInterval: 100,
@@ -173,8 +175,10 @@ describe('SigninService', () => {
             // 等待状态保存
             await new Promise(resolve => setTimeout(resolve, 150));
             expect(service.isDialogOpen).toBe(true);
-            // 模拟页面刷新
+            // 模拟页面刷新 - 保存 localStorage（浏览器刷新时不会调用 dispose，但会保留 localStorage）
+            const savedData = localStorageMock.getItem('__signin_service_state__');
             service.dispose();
+            localStorageMock.setItem('__signin_service_state__', savedData);
             // 创建新服务实例
             const newService = new SigninService(mockApi);
             await newService.init();

package/output/toaster/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import 'react-toastify/dist/ReactToastify.css';
 interface ToastCatcherProps {
     defaultMessage?: string;
     children: React.ReactNode;

package/output/toaster/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/toaster/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAIhD,OAAO,uCAAuC,CAAA;AAE9C,UAAU,iBAAiB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAC1C;AAED,+BAA+B;AAC/B,wBAAgB,OAAO,CAAC,KAAK,EAAE,iBAAiB,2CAuE/C;yBAvEe,OAAO;wBAgFE,KAAK,CAAC,SAAS;yBAId,KAAK,CAAC,SAAS;2BAIb,KAAK,CAAC,SAAS;2BAIf,KAAK,CAAC,SAAS"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../source/toaster/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAIhD,UAAU,iBAAiB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAC1C;AAED,+BAA+B;AAC/B,wBAAgB,OAAO,CAAC,KAAK,EAAE,iBAAiB,2CAkE/C;yBAlEe,OAAO;wBA2EE,KAAK,CAAC,SAAS;yBAId,KAAK,CAAC,SAAS;2BAIb,KAAK,CAAC,SAAS;2BAIf,KAAK,CAAC,SAAS"}

package/output/toaster/index.js

@@ -1,8 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useRef } from 'react';
-import { ToastContainer, toast as baseToast } from 'react-toastify';
+import { toast, Toaster as SonnerToaster } from 'sonner';
 import { SystemError, UserError } from '@taicode/common-base';
-import 'react-toastify/dist/ReactToastify.css';
 /** 自动捕获和处理异步错误，无法识别的错误会保持原样 */
 export function Toaster(props) {
     const addEventListened = useRef(false);
@@ -55,17 +54,17 @@ export function Toaster(props) {
             handledErrors.current = new WeakSet();
         };
     }, []);
-    return (_jsxs(_Fragment, { children: [props.children, _jsx(ToastContainer, { newestOnTop: true, hideProgressBar: true, closeButton: false, position: "top-center" })] }));
+    return (_jsxs(_Fragment, { children: [props.children, _jsx(SonnerToaster, { position: "top-center", closeButton: true })] }));
 }
 Toaster.info = (content) => {
-    baseToast.info(content);
+    toast.info(content);
 };
 Toaster.error = (content) => {
-    baseToast.error(content);
+    toast.error(content);
 };
 Toaster.success = (content) => {
-    baseToast.success(content);
+    toast.success(content);
 };
 Toaster.warning = (content) => {
-    baseToast.warning(content);
+    toast.warning(content);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taicode/common-web",
-  "version": "1.1.21",
+  "version": "3.0.1",
   "author": "Alain",
   "license": "ISC",
   "description": "",
@@ -28,31 +28,37 @@
     "dev": "tsc -p tsconfig.json --watch"
   },
   "peerDependencies": {
-    "@taicode/common-base": ">=1.1.0",
-    "@needle-di/core": ">=1.0.0",
     "@heroicons/react": "^2.2.0",
-    "mobx-react-lite": "^4.1.1",
+    "@needle-di/core": ">=1.0.0",
+    "@taicode/common-base": "^3.0.1",
     "@types/react": ">=18",
     "mobx": ">=6",
+    "mobx-react-lite": "^4.1.1",
     "react": ">=18"
   },
   "dependencies": {
-    "react-toastify": "^11.0.5",
-    "@heroicons/react": "^2.2.0",
     "@headlessui/react": "^2.2.4",
+    "@heroicons/react": "^2.2.0",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-slot": "^1.2.4",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
     "framer-motion": "^12.19.2",
-    "clsx": "^2.1.1"
+    "sonner": "^1.7.1",
+    "tailwind-merge": "^3.4.0"
   },
   "devDependencies": {
-    "@testing-library/react": "^14.0.0",
+    "@needle-di/core": "^1.0.0",
     "@testing-library/jest-dom": "^6.1.0",
-    "jsdom": "^23.0.0",
-    "vitest": "^1.0.0",
-    "@vitest/ui": "^1.0.0",
+    "@testing-library/react": "^14.0.0",
     "@types/react": "^18.0.0",
-    "@needle-di/core": "^1.0.0",
-    "mobx-react-lite": "^4.1.1",
+    "@vitest/ui": "^1.0.0",
+    "execa": "^8.0.1",
+    "jsdom": "^23.0.0",
     "mobx": "^6.0.0",
-    "react": "^18.0.0"
+    "mobx-react-lite": "^4.1.1",
+    "react": "^18.0.0",
+    "type-detect": "^4.1.0",
+    "vitest": "^1.0.0"
   }
 }