@0xchain/with-login 1.1.0-beta.32 → 1.1.0-beta.33

package/dist/index.d.ts

@@ -23,24 +23,12 @@ interface LoginProviderProps {
     children: React.ReactNode;
     loginSuccessCallback?: () => Promise<void>;
 }
-/**
- * LoginProvider 组件：提供全局登录状态和功能
- */
 export declare function LoginProvider({ children, loginSuccessCallback }: LoginProviderProps): import("react/jsx-runtime").JSX.Element;
-/**
- * useLogin hook：消费 LoginContext
- */
 export declare function useLogin(): LoginContextValue;
 interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<HTMLElement> {
     children?: React.ReactNode;
     onClick?: () => void;
 }
-/**
- * 一个简单封装：
- * - children 作为触发区域
- * - 使用全局 LoginProvider 的登录功能
- * - 如果提供了 onClick，会在登录成功后调用
- */
 export declare function WithLogin({ children, onClick, ...rest }: WithLoginProps): import("react/jsx-runtime").JSX.Element | null;
 export default WithLogin;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8E,MAAM,OAAO,CAAC;AAMnG,eAAO,MAAM,OAAO,eAGnB,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,iBAAiB;IAEhC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAExD,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC;CACpF;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAKD;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,oBAA8C,EAAE,EAAE,kBAAkB,2CA0H7G;AAED;;GAEG;AACH,wBAAgB,QAAQ,IAAI,iBAAiB,CAM5C;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,kDAevE;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA8E,MAAM,OAAO,CAAC;AAMnG,eAAO,MAAM,OAAO,eAEnB,CAAC;AAEF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,4BAA4B,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC;CACpF;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAuCD,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,oBAA8C,EAAE,EAAE,kBAAkB,2CAoG7G;AAED,wBAAgB,QAAQ,IAAI,iBAAiB,CAM5C;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC;IACnC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,kDAcvE;AAED,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -19,6 +19,31 @@ var OpenLoginType = /* @__PURE__ */ ((OpenLoginType2) => {
   return OpenLoginType2;
 })(OpenLoginType || {});
 const LoginContext = createContext(void 0);
+function getStorageTheme(storageKey) {
+  const fromCookie = Cookies.get(storageKey);
+  if (fromCookie) return fromCookie;
+  try {
+    return window.localStorage.getItem(storageKey);
+  } catch {
+    return null;
+  }
+}
+function resolveThemeNow(resolvedTheme) {
+  if (resolvedTheme === "light" || resolvedTheme === "dark") return resolvedTheme;
+  if (typeof document !== "undefined" && document.documentElement.classList.contains("dark")) {
+    return "dark";
+  }
+  const storageKey = `${(process.env.NEXT_PUBLIC_BRAND || "ichatgo").toLowerCase()}-theme`;
+  const persisted = getStorageTheme(storageKey);
+  if (persisted === "dark" || persisted === "light") return persisted;
+  if (persisted === "system") {
+    return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+  }
+  return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+}
+function buildAuthUrl(locale, path, theme, redirectUri) {
+  return `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/${path}?mode=dialog&theme=${theme}&redirect_uri=${encodeURIComponent(redirectUri)}`;
+}
 function LoginProvider({ children, loginSuccessCallback = () => Promise.resolve() }) {
   const [isOpen, setIsOpen] = useState(false);
   const [mounted, setMounted] = useState(false);
@@ -26,27 +51,23 @@ function LoginProvider({ children, loginSuccessCallback = () => Promise.resolve(
   const callbacksRef = useRef(/* @__PURE__ */ new Set());
   const locale = useLocale();
   const { resolvedTheme } = useTheme();
-  const currentTheme = mounted && resolvedTheme ? resolvedTheme : "light";
+  const currentTheme = mounted ? resolveThemeNow(resolvedTheme) : "light";
   const openLogin = useCallback((type) => {
-    const redirect_uri = typeof window !== "undefined" ? window.location.href : "";
-    const loginUrl = `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/login?mode=dialog&theme=${currentTheme}&redirect_uri=${redirect_uri}`;
-    const registerUrl = `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/register?mode=dialog&theme=${currentTheme}&redirect_uri=${redirect_uri}`;
+    const redirectUri = typeof window !== "undefined" ? window.location.href : "";
+    const theme = resolveThemeNow(resolvedTheme);
+    const loginUrl = buildAuthUrl(locale, "login", theme, redirectUri);
+    const registerUrl = buildAuthUrl(locale, "register", theme, redirectUri);
     setIsOpen(true);
     setUrl(type === "register" ? registerUrl : loginUrl);
-  }, [currentTheme, locale]);
+  }, [locale, resolvedTheme]);
   const closeLogin = useCallback(() => {
     setIsOpen(false);
+    setUrl(null);
   }, []);
   const setLoginOpen = useCallback((open) => {
     setIsOpen(open);
+    if (!open) setUrl(null);
   }, []);
-  useEffect(() => {
-    if (currentTheme) {
-      const redirect_uri = typeof window !== "undefined" ? window.location.href : "";
-      const loginUrl = `${process.env.NEXT_PUBLIC_AUTH_URL}/${locale}/login?mode=dialog&theme=${currentTheme}&redirect_uri=${redirect_uri}`;
-      setUrl(loginUrl);
-    }
-  }, [currentTheme]);
   useEffect(() => {
     setMounted(true);
     const handleMessage = (event) => {
@@ -54,7 +75,6 @@ function LoginProvider({ children, loginSuccessCallback = () => Promise.resolve(
         closeLogin();
       }
       if (event.data?.type === "loginSuccess") {
-        console.log("handleMessage", event.data.type);
         closeLogin();
         window.location.reload();
       }
@@ -71,39 +91,30 @@ function LoginProvider({ children, loginSuccessCallback = () => Promise.resolve(
     };
   }, []);
   const Trigger = useCallback(
-    ({ children: children2, ...rest }) => /* @__PURE__ */ jsx("div", { onClick: () => openLogin(), style: { cursor: "pointer" }, ...rest, children: children2 }),
+    ({ children: triggerChildren, ...rest }) => /* @__PURE__ */ jsx("div", { onClick: () => openLogin(), style: { cursor: "pointer" }, ...rest, children: triggerChildren }),
     [openLogin]
   );
   const loginModalElement = React.useMemo(() => {
-    if (isLogin()) return null;
+    if (isLogin() || !isOpen || !url) return null;
     return /* @__PURE__ */ jsx(
       "div",
       {
         className: twMerge(
-          " left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 w-full h-full bg-[rgba(0,0,0,0.7)] opacity-0 z-[-1]",
-          "transition-all duration-500 zoom-in-out fixed block",
-          isOpen && "z-99999 opacity-100"
+          "fixed left-1/2 top-1/2 z-99999 block h-full w-full -translate-x-1/2 -translate-y-1/2",
+          "bg-[rgba(0,0,0,0.7)] opacity-100 transition-all duration-500 zoom-in-out"
         ),
-        children: url && /* @__PURE__ */ jsx(
+        children: /* @__PURE__ */ jsx(
           "iframe",
           {
-            src: url ?? "",
-            className: twMerge(
-              "w-full h-full border-none relative z-10 transition-opacity duration-300",
-              "opacity-100"
-            ),
+            src: url,
+            className: "relative z-10 h-full w-full border-none opacity-100 transition-opacity duration-300",
             title: "Login",
             sandbox: "allow-scripts allow-forms allow-same-origin"
-          },
-          `login-iframe-${currentTheme}`
+          }
         )
       }
     );
-  }, [
-    currentTheme,
-    isOpen,
-    url
-  ]);
+  }, [isOpen, url]);
   const value = {
     isOpen,
     openLogin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/with-login",
-  "version": "1.1.0-beta.32",
+  "version": "1.1.0-beta.33",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -18,24 +18,24 @@
     "!**/*.tsbuildinfo"
   ],
   "peerDependencies": {
-    "@0xchain/next-themes": "1.0.0",
-    "js-cookie": "3.0.5",
-    "next": "16.1.6",
-    "next-intl": "4.8.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
-    "tailwind-merge": "3.3.1"
+    "@0xchain/next-themes": "catalog:",
+    "js-cookie": "catalog:",
+    "next": "catalog:",
+    "next-intl": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:",
+    "tailwind-merge": "catalog:"
   },
   "devDependencies": {
-    "@0xchain/next-themes": "1.0.0",
-    "@types/js-cookie": "3.0.6",
-    "js-cookie": "3.0.5",
-    "next": "16.1.6",
-    "next-intl": "4.8.2",
-    "react": "19.1.1",
-    "react-dom": "19.1.1",
-    "rollup-plugin-preserve-use-client": "3.0.1",
-    "tailwind-merge": "3.3.1"
+    "@0xchain/next-themes": "catalog:",
+    "@types/js-cookie": "catalog:",
+    "js-cookie": "catalog:",
+    "next": "catalog:",
+    "next-intl": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:",
+    "rollup-plugin-preserve-use-client": "catalog:",
+    "tailwind-merge": "catalog:"
   },
   "nx": {
     "tags": [
@@ -45,4 +45,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-present 0xchain
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.