@ichaingo/with-login 1.4.54 → 1.4.55

package/dist/index.d.ts

@@ -20,6 +20,7 @@ export interface UseLoginResult {
     mounted: boolean;
     Trigger: React.FC<React.HTMLAttributes<HTMLDivElement>>;
     LoginModal: React.FC;
+    Prefetch: React.FC;
 }
 interface UseLoginProps {
     loginSuccessCallback?: () => Promise<void>;
@@ -30,7 +31,7 @@ interface UseLoginProps {
  * - 返回 LoginModal：实际渲染登录弹窗（使用 createPortal）
  */
 export declare function useLogin({ loginSuccessCallback }: UseLoginProps): UseLoginResult;
-interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<any> {
+interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<HTMLElement> {
     children?: React.ReactNode;
     onClick?: () => void;
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAOhE,eAAO,MAAM,OAAO,eAEnB,CAAC;AACF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AACD,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AACD,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAE,IAAI,CAAC,EAAE,aAAa,KAAM,IAAI,CAAC;IAC5C,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,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;CACtB;AACD,UAAU,aAAa;IACrB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAC,oBAA8C,EAAC,EAAE,aAAa,GAAG,cAAc,CAiIxG;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAWvE;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAOhE,eAAO,MAAM,OAAO,eAEnB,CAAC;AACF,oBAAY,gBAAgB;IAC1B,iBAAiB,oBAAoB;IACrC,aAAa,iBAAiB;CAC/B;AACD,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AACD,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAE,IAAI,CAAC,EAAE,aAAa,KAAM,IAAI,CAAC;IAC5C,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,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,EAAE,MAAM,IAAI,CAAC;IAC7B,OAAO,EAAE,OAAO,CAAC;IAEjB,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IACxD,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;CACpB;AACD,UAAU,aAAa;IACrB,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5C;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAC,oBAA8C,EAAC,EAAE,aAAa,GAAG,cAAc,CAoJxG;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;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAYvE;AAED,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -1,40 +1,51 @@
 'use client';
-import { jsx as l, jsxs as y, Fragment as T } from "react/jsx-runtime";
-import { useState as m, useCallback as i, useEffect as U } from "react";
-import { createPortal as b } from "react-dom";
-import { useLocale as M } from "next-intl";
+import { jsx as s, jsxs as I, Fragment as C } from "react/jsx-runtime";
+import { useState as d, useCallback as i, useEffect as w } from "react";
+import { createPortal as E } from "react-dom";
+import { useLocale as G } from "next-intl";
 import { twMerge as _ } from "tailwind-merge";
-import { useTheme as O } from "@ichaingo/next-themes";
-import x from "js-cookie";
-const k = () => !!x.get("id_token");
-var C = /* @__PURE__ */ ((e) => (e.CLOSE_LOGIN_MODAL = "closeLoginModal", e.LOGIN_SUCCESS = "loginSuccess", e))(C || {}), G = /* @__PURE__ */ ((e) => (e.LOGIN = "login", e.REGISTER = "register", e))(G || {});
-function P({ loginSuccessCallback: e = () => Promise.resolve() }) {
-  const [o, a] = m(!1), [r, f] = m(!1), [c, d] = m(!1), [g, E] = m(null), L = M(), { resolvedTheme: p } = O(), s = r && p ? p : "light", h = i((t) => {
-    const n = window.location.href, w = `${process.env.NEXT_PUBLIC_AUTH_URL}/${L}/login?mode=dialog&theme=${s}&redirect_uri=${n}`, S = `${process.env.NEXT_PUBLIC_AUTH_URL}/${L}/register?mode=dialog&theme=${s}&redirect_uri=${n}`;
-    a(!0), d(!1), E(t === "register" ? S : w);
-  }, [s, L]), u = i(() => {
-    a(!1);
-  }, []), I = i((t) => {
-    a(t), t && d(!1);
+import { useTheme as R } from "@ichaingo/next-themes";
+import z from "js-cookie";
+const J = () => !!z.get("id_token");
+var A = /* @__PURE__ */ ((e) => (e.CLOSE_LOGIN_MODAL = "closeLoginModal", e.LOGIN_SUCCESS = "loginSuccess", e))(A || {}), B = /* @__PURE__ */ ((e) => (e.LOGIN = "login", e.REGISTER = "register", e))(B || {});
+function j({ loginSuccessCallback: e = () => Promise.resolve() }) {
+  const [o, l] = d(!1), [t, m] = d(!1), [a, f] = d(!1), [g, P] = d(null), [x, $] = d(!1), y = G(), { resolvedTheme: p } = R(), N = window.location.href, c = t && p ? p : "light", n = `${process.env.NEXT_PUBLIC_AUTH_URL}/${y}/login?mode=dialog&theme=${c}&redirect_uri=${N}`, U = `${process.env.NEXT_PUBLIC_AUTH_URL}/${y}/register?mode=dialog&theme=${c}&redirect_uri=${N}`, L = i((r) => {
+    l(!0), f(!1), P(r === "register" ? U : n);
+  }, [n, U]), u = i(() => {
+    l(!1);
+  }, []), b = i((r) => {
+    l(r), r && f(!1);
   }, []);
-  U(() => {
-    o && r && d(!1);
-  }, [p, o, r]), U(() => {
-    f(!0);
-    const t = (n) => {
-      n.data.type === "closeLoginModal" && u(), n.data.type === "loginSuccess" && (u(), e && e());
+  w(() => {
+    o && t && f(!1);
+  }, [p, o, t]), w(() => {
+    m(!0);
+    const r = (v) => {
+      v.data.type === "closeLoginModal" && u(), v.data.type === "loginSuccess" && (u(), e && e());
     };
-    return window.addEventListener("message", t), () => {
-      window.removeEventListener("message", t);
+    return window.addEventListener("message", r), () => {
+      window.removeEventListener("message", r);
     };
-  }, []);
-  const v = i(() => {
-    d(!0);
-  }, []), $ = i(
-    ({ children: t, onClick: n, ...w }) => /* @__PURE__ */ l("div", { onClick: () => h(), style: { cursor: "pointer" }, ...w, children: t }),
-    [h]
-  ), N = i(() => o ? b(
-    /* @__PURE__ */ y(
+  }, [u, e]), w(() => {
+    t && n && $(!0);
+  }, [t, n]);
+  const h = i(() => {
+    f(!0);
+  }, []), S = i(
+    ({ children: r, onClick: v, ...O }) => /* @__PURE__ */ s("div", { onClick: () => L(), style: { cursor: "pointer" }, ...O, children: r }),
+    [L]
+  ), T = i(() => !x || !t || !n ? null : E(
+    /* @__PURE__ */ s("div", { className: "w-[1px] h-[1px] fixed left-0 bottom-0", children: /* @__PURE__ */ s(
+      "iframe",
+      {
+        src: n,
+        className: "w-[1px] h-[1px]",
+        title: "Login Prefetch"
+      }
+    ) }),
+    document.body
+  ), [x, t, n]), M = i(() => o ? E(
+    /* @__PURE__ */ I(
       "div",
       {
         className: _(
@@ -42,69 +53,70 @@ function P({ loginSuccessCallback: e = () => Promise.resolve() }) {
           o && "top-0 left-0 w-full h-full"
         ),
         children: [
-          /* @__PURE__ */ l(
+          /* @__PURE__ */ s(
             "div",
             {
               className: _(
                 "absolute inset-0 transition-opacity duration-300",
-                c ? "opacity-0 pointer-events-none" : "opacity-100 z-1002"
+                a ? "opacity-0 pointer-events-none" : "opacity-100 z-1002"
               )
             }
           ),
-          /* @__PURE__ */ l(
+          /* @__PURE__ */ s(
             "iframe",
             {
               src: g ?? "",
               className: _(
                 "w-full h-full border-none relative z-10 transition-opacity duration-300",
-                c ? "opacity-100" : "opacity-0"
+                a ? "opacity-100" : "opacity-0"
               ),
               title: "Login",
-              onLoad: v,
+              onLoad: h,
               sandbox: "allow-scripts allow-forms allow-same-origin"
             },
-            `login-iframe-${s}`
+            `login-iframe-${c}`
           )
         ]
       }
     ),
     document.body
   ) : null, [
-    u,
-    s,
-    v,
     c,
+    h,
+    a,
     o,
     g
   ]);
   return {
     isOpen: o,
-    openLogin: h,
+    openLogin: L,
     closeLogin: u,
-    setLoginOpen: I,
+    setLoginOpen: b,
     url: g,
-    currentTheme: s,
-    iframeLoaded: c,
-    handleIframeLoad: v,
-    mounted: r,
-    Trigger: $,
-    LoginModal: N
+    currentTheme: c,
+    iframeLoaded: a,
+    handleIframeLoad: h,
+    mounted: t,
+    Trigger: S,
+    LoginModal: M,
+    Prefetch: T
   };
 }
-function D({ children: e, onClick: o, ...a }) {
-  const { Trigger: r, LoginModal: f } = P({ loginSuccessCallback: async () => {
+function K({ children: e, onClick: o, ...l }) {
+  const { Trigger: t, LoginModal: m, Prefetch: a } = j({ loginSuccessCallback: async () => {
     o == null || o();
   } });
-  return /* @__PURE__ */ y(T, { children: [
-    e && /* @__PURE__ */ l(r, { ...a, children: e }),
-    /* @__PURE__ */ l(f, {})
+  return /* @__PURE__ */ I(C, { children: [
+    e && /* @__PURE__ */ s(t, { ...l, children: e }),
+    /* @__PURE__ */ s(m, {}),
+    /* @__PURE__ */ s(a, {})
   ] });
 }
 export {
-  C as LoginMessageType,
-  G as OpenLoginType,
-  D as WithLogin,
-  D as default,
-  k as isLogin,
-  P as useLogin
+  A as LoginMessageType,
+  B as OpenLoginType,
+  K as WithLogin,
+  K as default,
+  J as isLogin,
+  j as useLogin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/with-login",
-  "version": "1.4.54",
+  "version": "1.4.55",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",