@ichaingo/with-login 1.4.48 → 1.4.50

package/dist/index.d.ts

@@ -32,12 +32,13 @@ interface UseLoginProps {
 export declare function useLogin({ loginSuccessCallback }: UseLoginProps): UseLoginResult;
 interface WithLoginProps extends React.PropsWithChildren, React.HTMLAttributes<any> {
     children?: React.ReactNode;
+    onClick?: () => void;
 }
 /**
  * 一个简单封装：
  * - children 作为触发区域
  * - 内部自动渲染 LoginModal
  */
-export declare function WithLogin({ children, ...rest }: WithLoginProps): import("react/jsx-runtime").JSX.Element;
+export declare function WithLogin({ children, onClick, ...rest }: WithLoginProps): import("react/jsx-runtime").JSX.Element;
 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;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"}
+{"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"}

package/dist/index.js

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

package/package.json

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