@ichaingo/with-login 1.4.31 → 1.4.33

package/dist/index.d.ts

@@ -1,5 +1,13 @@
 import { default as React } from 'react';
 export declare const isLogin: () => boolean;
+export declare enum LoginMessageType {
+    CLOSE_LOGIN_MODAL = "closeLoginModal",
+    LOGIN_SUCCESS = "loginSuccess"
+}
+export declare enum OpenLoginType {
+    LOGIN = "login",
+    REGISTER = "register"
+}
 export interface UseLoginResult {
     isOpen: boolean;
     openLogin: () => void;
@@ -13,12 +21,15 @@ export interface UseLoginResult {
     Trigger: React.FC<React.HTMLAttributes<HTMLDivElement>>;
     LoginModal: React.FC;
 }
+interface UseLoginProps {
+    loginSuccessCallback?: () => Promise<void>;
+}
 /**
  * 登录逻辑 + UI 全都在这个 hook 里面
  * - 返回 Trigger：包裹触发登录的元素
  * - 返回 LoginModal：实际渲染登录弹窗（使用 createPortal）
  */
-export declare function useLogin(): UseLoginResult;
+export declare function useLogin({ loginSuccessCallback }: UseLoginProps): UseLoginResult;
 interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<any> {
     children?: React.ReactNode;
 }

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;AAEF,MAAM,WAAW,cAAc;IAE7B,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,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;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,IAAI,cAAc,CAiHzC;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAS9D;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,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,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,CAgIxG;AAED,UAAU,cACR,SAAQ,KAAK,CAAC,iBAAiB,EAC7B,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,cAAc,2CAS9D;AAED,eAAe,SAAS,CAAC"}

package/dist/index.js

@@ -1,133 +1,69 @@
 'use client';
-import { jsx as d, jsxs as x, Fragment as j } from "react/jsx-runtime";
-import { useState as h, useEffect as w, useCallback as f } from "react";
-import { createPortal as k } from "react-dom";
-import { useLocale as R } from "next-intl";
-import { twMerge as L } from "tailwind-merge";
-import { useTheme as B } from "@ichaingo/next-themes";
-/*! js-cookie v3.0.5 | MIT */
-function g(e) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t = arguments[r];
-    for (var a in t)
-      e[a] = t[a];
-  }
-  return e;
-}
-var O = {
-  read: function(e) {
-    return e[0] === '"' && (e = e.slice(1, -1)), e.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
-  },
-  write: function(e) {
-    return encodeURIComponent(e).replace(
-      /%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g,
-      decodeURIComponent
-    );
-  }
-};
-function C(e, r) {
-  function t(o, c, n) {
-    if (!(typeof document > "u")) {
-      n = g({}, r, n), typeof n.expires == "number" && (n.expires = new Date(Date.now() + n.expires * 864e5)), n.expires && (n.expires = n.expires.toUTCString()), o = encodeURIComponent(o).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
-      var s = "";
-      for (var i in n)
-        n[i] && (s += "; " + i, n[i] !== !0 && (s += "=" + n[i].split(";")[0]));
-      return document.cookie = o + "=" + e.write(c, o) + s;
-    }
-  }
-  function a(o) {
-    if (!(typeof document > "u" || arguments.length && !o)) {
-      for (var c = document.cookie ? document.cookie.split("; ") : [], n = {}, s = 0; s < c.length; s++) {
-        var i = c[s].split("="), u = i.slice(1).join("=");
-        try {
-          var l = decodeURIComponent(i[0]);
-          if (n[l] = e.read(u, l), o === l)
-            break;
-        } catch {
-        }
-      }
-      return o ? n[o] : n;
-    }
-  }
-  return Object.create(
-    {
-      set: t,
-      get: a,
-      remove: function(o, c) {
-        t(
-          o,
-          "",
-          g({}, c, {
-            expires: -1
-          })
-        );
-      },
-      withAttributes: function(o) {
-        return C(this.converter, g({}, this.attributes, o));
-      },
-      withConverter: function(o) {
-        return C(g({}, this.converter, o), this.attributes);
-      }
-    },
-    {
-      attributes: { value: Object.freeze(r) },
-      converter: { value: Object.freeze(e) }
-    }
-  );
-}
-var z = C(O, { path: "/" });
-const b = () => !!z.get("id_token");
-function A() {
-  const [e, r] = h(!1), [t, a] = h(!1), [o, c] = h(!1), n = R(), { resolvedTheme: s } = B();
-  w(() => {
-    a(!0);
+import { jsx as a, jsxs as U, Fragment as T } from "react/jsx-runtime";
+import { useState as f, useCallback as i, useEffect as h } from "react";
+import { createPortal as C } from "react-dom";
+import { useLocale as M } from "next-intl";
+import { twMerge as v } from "tailwind-merge";
+import { useTheme as O } from "@ichaingo/next-themes";
+import S from "js-cookie";
+const H = () => !!S.get("id_token");
+var $ = /* @__PURE__ */ ((e) => (e.CLOSE_LOGIN_MODAL = "closeLoginModal", e.LOGIN_SUCCESS = "loginSuccess", e))($ || {}), b = /* @__PURE__ */ ((e) => (e.LOGIN = "login", e.REGISTER = "register", e))(b || {});
+function x({ loginSuccessCallback: e = () => Promise.resolve() }) {
+  const [t, l] = f(!1), [r, w] = f(!1), [c, d] = f(!1), [G, _] = f(null), g = M(), { resolvedTheme: u } = O(), n = r && u ? u : "light", L = i((o) => {
+    const s = `${process.env.NEXT_PUBLIC_AUTH_URL}/${g}/login?mode=dialog&theme=${n}`, N = `${process.env.NEXT_PUBLIC_AUTH_URL}/${g}/register?mode=dialog&theme=${n}`;
+    l(!0), d(!1), _(o === "register" ? N : s);
+  }, [n, g]), m = i(() => {
+    l(!1);
+  }, []), E = i((o) => {
+    l(o), o && d(!1);
   }, []);
-  const i = t && s ? s : "light", u = `${process.env.NEXT_PUBLIC_AUTH_URL}/${n}/login?mode=dialog&theme=${i}`, l = f(() => {
-    r(!0), c(!1);
-  }, []), m = f(() => {
-    r(!1);
-  }, []), y = f((p) => {
-    r(p), p && c(!1);
+  h(() => {
+    t && r && d(!1);
+  }, [u, t, r]), h(() => {
+    w(!0);
+    const o = (s) => {
+      s.data.type === "closeLoginModal" && m(), s.data.type === "loginSuccess" && (m(), e && e());
+    };
+    return window.addEventListener("message", o), () => {
+      window.removeEventListener("message", o);
+    };
   }, []);
-  w(() => {
-    e && t && c(!1);
-  }, [s, e, t]);
-  const v = f(() => {
-    c(!0);
-  }, []), U = f(
-    ({ children: p, ...T }) => /* @__PURE__ */ d("div", { onClick: l, style: { cursor: "pointer" }, ...T, children: p }),
-    [l]
-  ), I = f(() => e ? k(
-    /* @__PURE__ */ x(
+  const p = i(() => {
+    d(!0);
+  }, []), I = i(
+    ({ children: o, ...s }) => /* @__PURE__ */ a("div", { onClick: L, style: { cursor: "pointer" }, ...s, children: o }),
+    [L]
+  ), y = i(() => t ? C(
+    /* @__PURE__ */ U(
       "div",
       {
-        className: L(
+        className: v(
           "fixed w-0 h-9 bg-[rgba(0,0,0,0.7)] z-1000",
-          e && "top-0 left-0 w-full h-full"
+          t && "top-0 left-0 w-full h-full"
         ),
         children: [
-          /* @__PURE__ */ d(
+          /* @__PURE__ */ a(
             "div",
             {
-              className: L(
+              className: v(
                 "absolute inset-0 transition-opacity duration-300",
-                o ? "opacity-0 pointer-events-none" : "opacity-100 z-30"
+                c ? "opacity-0 pointer-events-none" : "opacity-100 z-30"
               )
             }
           ),
-          /* @__PURE__ */ d(
+          /* @__PURE__ */ a(
             "iframe",
             {
-              src: u,
-              className: L(
+              src: loginUrl,
+              className: v(
                 "w-full h-full border-none relative z-10 transition-opacity duration-300",
-                o ? "opacity-100" : "opacity-0"
+                c ? "opacity-100" : "opacity-0"
               ),
               title: "Login",
-              onLoad: v,
+              onLoad: p,
               sandbox: "allow-scripts allow-forms allow-same-origin"
             },
-            `login-iframe-${i}`
+            `login-iframe-${n}`
           )
         ]
       }
@@ -135,36 +71,38 @@ function A() {
     document.body
   ) : null, [
     m,
-    i,
-    v,
-    o,
-    e,
-    u
+    n,
+    p,
+    c,
+    t,
+    loginUrl
   ]);
   return {
-    isOpen: e,
-    openLogin: l,
+    isOpen: t,
+    openLogin: L,
     closeLogin: m,
-    setLoginOpen: y,
-    loginUrl: u,
-    currentTheme: i,
-    iframeLoaded: o,
-    handleIframeLoad: v,
-    mounted: t,
-    Trigger: U,
-    LoginModal: I
+    setLoginOpen: E,
+    loginUrl,
+    currentTheme: n,
+    iframeLoaded: c,
+    handleIframeLoad: p,
+    mounted: r,
+    Trigger: I,
+    LoginModal: y
   };
 }
-function P({ children: e, ...r }) {
-  const { Trigger: t, LoginModal: a } = A();
-  return /* @__PURE__ */ x(j, { children: [
-    e && /* @__PURE__ */ d(t, { ...r, children: e }),
-    /* @__PURE__ */ d(a, {})
+function X({ children: e, ...t }) {
+  const { Trigger: l, LoginModal: r } = x();
+  return /* @__PURE__ */ U(T, { children: [
+    e && /* @__PURE__ */ a(l, { ...t, children: e }),
+    /* @__PURE__ */ a(r, {})
   ] });
 }
 export {
-  P as WithLogin,
-  P as default,
-  b as isLogin,
-  A as useLogin
+  $ as LoginMessageType,
+  b as OpenLoginType,
+  X as WithLogin,
+  X as default,
+  H as isLogin,
+  x as useLogin
 };

package/package.json

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