@ichaingo/with-login 1.4.56 → 1.4.58

package/dist/index.d.ts

@@ -8,7 +8,7 @@ export declare enum OpenLoginType {
     LOGIN = "login",
     REGISTER = "register"
 }
-export interface UseLoginResult {
+export interface LoginContextValue {
     isOpen: boolean;
     openLogin: (type?: OpenLoginType) => void;
     closeLogin: () => void;
@@ -19,18 +19,20 @@ export interface UseLoginResult {
     handleIframeLoad: () => void;
     mounted: boolean;
     Trigger: React.FC<React.HTMLAttributes<HTMLDivElement>>;
-    LoginModal: React.FC;
-    Prefetch: React.FC;
+    registerLoginSuccessCallback: (callback: () => void | Promise<void>) => () => void;
 }
-interface UseLoginProps {
+interface LoginProviderProps {
+    children: React.ReactNode;
     loginSuccessCallback?: () => Promise<void>;
 }
 /**
- * 登录逻辑 + UI 全都在这个 hook 里面
- * - 返回 Trigger：包裹触发登录的元素
- * - 返回 LoginModal：实际渲染登录弹窗（使用 createPortal）
+ * LoginProvider 组件：提供全局登录状态和功能
  */
-export declare function useLogin({ loginSuccessCallback }: UseLoginProps): UseLoginResult;
+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;
@@ -38,8 +40,9 @@ interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<H
 /**
  * 一个简单封装：
  * - children 作为触发区域
- * - 内部自动渲染 LoginModal
+ * - 使用全局 LoginProvider 的登录功能
+ * - 如果提供了 onClick，会在登录成功后调用
  */
-export declare function WithLogin({ children, onClick, ...rest }: WithLoginProps): import("react/jsx-runtime").JSX.Element;
+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,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,CAqJxG;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"}
+{"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;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,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;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,2CA8I7G;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"}

package/dist/index.js

@@ -1,123 +1,112 @@
 'use client';
-import { jsx as s, jsxs as y, Fragment as M } from "react/jsx-runtime";
-import { useState as d, useCallback as n, useEffect as U } from "react";
-import { createPortal as x } from "react-dom";
-import { useLocale as O } from "next-intl";
-import { twMerge as N } from "tailwind-merge";
-import { useTheme as C } from "@ichaingo/next-themes";
-import R from "js-cookie";
-const k = () => !!R.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 G({ loginSuccessCallback: e = () => Promise.resolve() }) {
-  const [o, l] = d(!1), [t, g] = d(!1), [i, f] = d(!1), [L, E] = d(null), [$, I] = d(!1), u = O(), { resolvedTheme: p } = C(), h = window.location.href, a = t && p ? p : "light", v = n((r) => {
-    const c = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog&theme=${a}&redirect_uri=${h}`, w = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/register?mode=dialog&theme=${a}&redirect_uri=${h}`;
-    l(!0), f(!1), E(r === "register" ? w : c);
-  }, [a, u, h]), m = n(() => {
-    l(!1);
-  }, []), P = n((r) => {
-    l(r), r && f(!1);
+import { jsx as w, jsxs as R } from "react/jsx-runtime";
+import y, { createContext as O, useState as L, useRef as P, useCallback as s, useEffect as p, useContext as k } from "react";
+import { useLocale as A } from "next-intl";
+import { twMerge as x } from "tailwind-merge";
+import { useTheme as B } from "@ichaingo/next-themes";
+import G from "js-cookie";
+const K = () => !!G.get("id_token");
+var H = /* @__PURE__ */ ((e) => (e.CLOSE_LOGIN_MODAL = "closeLoginModal", e.LOGIN_SUCCESS = "loginSuccess", e))(H || {}), X = /* @__PURE__ */ ((e) => (e.LOGIN = "login", e.REGISTER = "register", e))(X || {});
+const S = O(void 0);
+function Q({ children: e, loginSuccessCallback: l = () => Promise.resolve() }) {
+  const [n, a] = L(!1), [i, $] = L(!1), [h, c] = L(!1), [d, C] = L(null), E = P(/* @__PURE__ */ new Set()), u = A(), { resolvedTheme: v } = B(), t = i && v ? v : "light", _ = s((o) => {
+    const r = typeof window < "u" ? window.location.href : "", g = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog&theme=${t}&redirect_uri=${r}`, m = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/register?mode=dialog&theme=${t}&redirect_uri=${r}`;
+    a(!0), c(!1), C(o === "register" ? m : g);
+  }, [t, u]), f = s(() => {
+    a(!1);
+  }, []), I = s((o) => {
+    a(o), o && c(!1);
   }, []);
-  U(() => {
-    o && t && f(!1);
-  }, [p, o, t]), U(() => {
-    g(!0);
-    const r = (c) => {
-      c.data.type === "closeLoginModal" && m(), c.data.type === "loginSuccess" && (m(), e && e());
+  p(() => {
+    n && i && c(!1);
+  }, [v, n, i]), p(() => {
+    if (t) {
+      const o = typeof window < "u" ? window.location.href : "", r = `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog&theme=${t}&redirect_uri=${o}`;
+      C(r);
+    }
+  }, [t]), p(() => {
+    $(!0);
+    const o = (r) => {
+      var g, m;
+      ((g = r.data) == null ? void 0 : g.type) === "closeLoginModal" && f(), ((m = r.data) == null ? void 0 : m.type) === "loginSuccess" && (console.log("handleMessage", r.data.type), f(), window.location.reload());
     };
-    return window.addEventListener("message", r), () => {
-      window.removeEventListener("message", r);
+    return window.addEventListener("message", o), () => {
+      window.removeEventListener("message", o);
     };
-  }, [m, e]), U(() => {
-    t && I(!0);
-  }, [t]);
-  const _ = n(() => {
-    f(!0);
-  }, []), T = n(
-    ({ children: r, onClick: c, ...w }) => /* @__PURE__ */ s("div", { onClick: () => v(), style: { cursor: "pointer" }, ...w, children: r }),
-    [v]
-  ), b = n(() => !$ || !t ? null : x(
-    /* @__PURE__ */ s("div", { className: "w-[1px] h-[1px] fixed left-0 bottom-0", children: /* @__PURE__ */ s(
-      "iframe",
-      {
-        src: `${process.env.NEXT_PUBLIC_AUTH_URL}/${u}/login?mode=dialog`,
-        className: "w-[1px] h-[1px]",
-        title: "Login Prefetch"
-      }
-    ) }),
-    document.body
-  ), [$, t]), S = n(() => o ? x(
-    /* @__PURE__ */ y(
-      "div",
-      {
-        className: N(
-          "fixed w-0 h-9 bg-[rgba(0,0,0,0.7)] z-1002",
-          o && "top-0 left-0 w-full h-full"
-        ),
-        children: [
-          /* @__PURE__ */ s(
-            "div",
-            {
-              className: N(
-                "absolute inset-0 transition-opacity duration-300",
-                i ? "opacity-0 pointer-events-none" : "opacity-100 z-1002"
-              )
-            }
+  }, [f, l]);
+  const U = s(() => {
+    console.log("iframe loaded"), c(!0);
+  }, []), T = s((o) => (E.current.add(o), () => {
+    E.current.delete(o);
+  }), []), b = s(
+    ({ children: o, ...r }) => /* @__PURE__ */ w("div", { onClick: () => _(), style: { cursor: "pointer" }, ...r, children: o }),
+    [_]
+  ), M = y.useMemo(() => /* @__PURE__ */ w(
+    "div",
+    {
+      className: x(
+        "fixed left-0 bottom-0 w-px h-px bg-[rgba(0,0,0,0.7)] z-1002",
+        "transition-all duration-500 ease-in-out",
+        n && "w-full h-full "
+      ),
+      children: d && /* @__PURE__ */ w(
+        "iframe",
+        {
+          src: d ?? "",
+          className: x(
+            "w-full h-full border-none relative z-10 transition-opacity duration-300",
+            h ? "opacity-0" : "opacity-100"
           ),
-          /* @__PURE__ */ s(
-            "iframe",
-            {
-              src: L ?? "",
-              className: N(
-                "w-full h-full border-none relative z-10 transition-opacity duration-300",
-                i ? "opacity-100" : "opacity-0"
-              ),
-              title: "Login",
-              onLoad: _,
-              sandbox: "allow-scripts allow-forms allow-same-origin"
-            },
-            `login-iframe-${a}`
-          )
-        ]
-      }
-    ),
-    document.body
-  ) : null, [
-    a,
-    _,
-    i,
-    o,
-    L
-  ]);
-  return {
-    isOpen: o,
-    openLogin: v,
-    closeLogin: m,
-    setLoginOpen: P,
-    url: L,
-    currentTheme: a,
-    iframeLoaded: i,
-    handleIframeLoad: _,
-    mounted: t,
-    Trigger: T,
-    LoginModal: S,
-    Prefetch: b
+          title: "Login",
+          onLoad: U,
+          sandbox: "allow-scripts allow-forms allow-same-origin"
+        },
+        `login-iframe-${t}`
+      )
+    }
+  ), [
+    t,
+    U,
+    h,
+    n,
+    d
+  ]), N = {
+    isOpen: n,
+    openLogin: _,
+    closeLogin: f,
+    setLoginOpen: I,
+    url: d,
+    currentTheme: t,
+    iframeLoaded: h,
+    handleIframeLoad: U,
+    mounted: i,
+    Trigger: b,
+    registerLoginSuccessCallback: T
   };
-}
-function q({ children: e, onClick: o, ...l }) {
-  const { Trigger: t, LoginModal: g, Prefetch: i } = G({ loginSuccessCallback: async () => {
-    o == null || o();
-  } });
-  return /* @__PURE__ */ y(M, { children: [
-    e && /* @__PURE__ */ s(t, { ...l, children: e }),
-    /* @__PURE__ */ s(g, {}),
-    /* @__PURE__ */ s(i, {})
+  return /* @__PURE__ */ R(S.Provider, { value: N, children: [
+    e,
+    M
   ] });
 }
+function j() {
+  const e = k(S);
+  if (e === void 0)
+    throw new Error("useLogin must be used within a LoginProvider");
+  return e;
+}
+function V({ children: e, onClick: l, ...n }) {
+  const { Trigger: a, registerLoginSuccessCallback: i } = j();
+  return p(() => {
+    if (l)
+      return i(l);
+  }, [l, i]), e ? /* @__PURE__ */ w(a, { ...n, children: e }) : null;
+}
 export {
-  A as LoginMessageType,
-  B as OpenLoginType,
-  q as WithLogin,
-  q as default,
-  k as isLogin,
-  G as useLogin
+  H as LoginMessageType,
+  Q as LoginProvider,
+  X as OpenLoginType,
+  V as WithLogin,
+  V as default,
+  K as isLogin,
+  j as useLogin
 };

package/package.json

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