@blocklet/ui-react 3.0.9 → 3.0.10

package/lib/UserCenter/components/user-info/user-status.js

@@ -1,139 +1,137 @@
-import { jsxs as E, jsx as l } from "react/jsx-runtime";
-import { Tooltip as H, Box as z, Badge as B } from "@mui/material";
-import U from "@emotion/styled";
-import { lazy as d, useState as C, useEffect as q, useCallback as A, useMemo as F, Suspense as L } from "react";
-import { useMemoizedFn as T, useInterval as Q, useUnmount as G, useCreation as J } from "ahooks";
-import { useLocaleContext as K } from "@arcblock/ux/lib/Locale/context";
-import { translate as P } from "@arcblock/ux/lib/Locale/util";
-import { formatToDatetime as V } from "@arcblock/ux/lib/Util";
-import { StatusEnum as t, DurationEnum as c } from "../../../@types/index.js";
-import X from "../status-dialog/index.js";
-import { translations as Y } from "../../libs/locales.js";
-import { isNotClear as $, isWithinTimeRange as Z, getTimeRemaining as _ } from "./utils.js";
-const ee = d(() => import("@arcblock/icons/lib/Meeting")), oe = d(() => import("@arcblock/icons/lib/Community")), ne = d(() => import("@arcblock/icons/lib/Holiday")), te = d(() => import("@arcblock/icons/lib/OffSick")), ie = d(() => import("@arcblock/icons/lib/WorkingRemotely")), I = {
-  [t.Meeting]: ee,
-  [t.Community]: oe,
-  [t.Holiday]: ne,
-  [t.OffSick]: te,
-  [t.WorkingRemotely]: ie
-}, re = {
-  [t.Meeting]: {
-    duration: c.OneHour,
+import { jsxs as w, jsx as s } from "react/jsx-runtime";
+import { Tooltip as E, Box as H, Badge as z } from "@mui/material";
+import B from "@emotion/styled";
+import { lazy as c, useState as k, useEffect as U, useCallback as q, useMemo as A, Suspense as F } from "react";
+import { useMemoizedFn as C, useInterval as L, useUnmount as Q, useCreation as G } from "ahooks";
+import { useLocaleContext as J } from "@arcblock/ux/lib/Locale/context";
+import { translate as K } from "@arcblock/ux/lib/Locale/util";
+import { formatToDatetime as P } from "@arcblock/ux/lib/Util";
+import { StatusEnum as o, DurationEnum as a } from "../../../@types/index.js";
+import V from "../status-dialog/index.js";
+import { translations as X } from "../../libs/locales.js";
+import { isNotClear as T, isWithinTimeRange as Y, getTimeRemaining as Z } from "./utils.js";
+const _ = c(() => import("@arcblock/icons/lib/Meeting")), tt = c(() => import("@arcblock/icons/lib/Community")), et = c(() => import("@arcblock/icons/lib/Holiday")), ot = c(() => import("@arcblock/icons/lib/OffSick")), nt = c(() => import("@arcblock/icons/lib/WorkingRemotely")), $ = {
+  [o.Meeting]: _,
+  [o.Community]: tt,
+  [o.Holiday]: et,
+  [o.OffSick]: ot,
+  [o.WorkingRemotely]: nt
+}, it = {
+  [o.Meeting]: {
+    duration: a.OneHour,
     durationName: "userStatus.duration.OneHour"
   },
-  [t.Community]: {
-    duration: c.ThirtyMinutes,
+  [o.Community]: {
+    duration: a.ThirtyMinutes,
     durationName: "userStatus.duration.ThirtyMinutes"
   },
-  [t.Holiday]: {
-    duration: c.ThisWeek,
+  [o.Holiday]: {
+    duration: a.ThisWeek,
     durationName: "userStatus.duration.ThisWeek"
   },
-  [t.OffSick]: {
-    duration: c.Today,
+  [o.OffSick]: {
+    duration: a.Today,
     durationName: "userStatus.duration.Today"
   },
-  [t.WorkingRemotely]: {
-    duration: c.ThisWeek,
+  [o.WorkingRemotely]: {
+    duration: a.ThisWeek,
     durationName: "userStatus.duration.ThisWeek"
   }
 };
-function ye({
-  isMobile: o = void 0,
-  size: R,
-  isMyself: g,
-  status: e,
-  onChange: s,
-  timezone: W = void 0
+function vt({
+  isMobile: t = void 0,
+  size: I,
+  isMyself: h,
+  status: i,
+  onChange: d,
+  timezone: R = void 0
 }) {
-  const { locale: m } = K(), u = T((n, i = {}) => P(Y, n, m, "en", i)), [b, p] = C(void 0), f = T(() => {
-    p(void 0);
+  const { locale: l } = J(), u = C((n, e = {}) => K(X, n, l, "en", e)), [W, m] = k(void 0), p = C(() => {
+    m(void 0);
   });
-  q(() => {
-    p(1e3);
-  }, [e]);
-  const N = Q(() => {
-    var n;
-    if (e != null && e.value && ((n = e == null ? void 0 : e.dateRange) == null ? void 0 : n.length) === 2) {
-      if ($(e))
+  U(() => {
+    m(1e3);
+  }, [i]);
+  const b = L(() => {
+    if (i?.value && i?.dateRange?.length === 2) {
+      if (T(i))
         return;
-      if (!Z(e.dateRange))
-        f(), s(void 0);
+      if (!Y(i.dateRange))
+        p(), d(void 0);
       else {
-        const a = _(e.dateRange[1]);
-        a > 0 ? p(a) : (f(), s(void 0));
+        const r = Z(i.dateRange[1]);
+        r > 0 ? m(r) : (p(), d(void 0));
       }
     } else
-      f();
-  }, b);
-  G(() => {
-    N();
+      p();
+  }, W);
+  Q(() => {
+    b();
   });
-  const [O, S] = C(null), x = A(() => Object.keys(c).map((i) => ({
-    id: c[i],
-    name: u(`userStatus.duration.${i}`)
-  })), [u]), h = J(() => {
-    const n = x();
-    return Object.keys(t).map((i) => {
-      const r = re[t[i]];
+  const [N, g] = k(null), S = q(() => Object.keys(a).map((e) => ({
+    id: a[e],
+    name: u(`userStatus.duration.${e}`)
+  })), [u]), f = G(() => {
+    const n = S();
+    return Object.keys(o).map((e) => {
+      const r = it[o[e]];
       return {
-        id: t[i],
-        name: u(`userStatus.${i}`),
-        icon: I[t[i]],
+        id: o[e],
+        name: u(`userStatus.${e}`),
+        icon: $[o[e]],
         ...r ? { duration: r.duration, durationName: u(r.durationName) } : {},
         children: n
       };
     });
-  }, [u, x, m]), D = (n) => {
-    g && S(n.currentTarget);
-  }, v = () => {
-    S(null);
-  }, j = (n) => {
-    g && (s(n), v());
-  }, y = I[e == null ? void 0 : e.value], M = F(() => {
-    var i;
-    const n = h.find((r) => r.id === (e == null ? void 0 : e.value));
+  }, [u, S, l]), O = (n) => {
+    h && g(n.currentTarget);
+  }, x = () => {
+    g(null);
+  }, D = (n) => {
+    h && (d(n), x());
+  }, v = $[i?.value], j = A(() => {
+    const n = f.find((e) => e.id === i?.value);
     if (n) {
-      const r = m === "zh" ? "zh-cn" : "en-us";
-      let a;
-      return $(e) || (a = (i = e == null ? void 0 : e.dateRange) == null ? void 0 : i.map((w) => V(w, { locale: r }))), a && a.length > 0 ? `${n.name}: ${a.join("~")}` : n.name;
+      const e = l === "zh" ? "zh-cn" : "en-us";
+      let r;
+      return T(i) || (r = i?.dateRange?.map((M) => P(M, { locale: e }))), r && r.length > 0 ? `${n.name}: ${r.join("~")}` : n.name;
     }
     return null;
-  }, [e, h, m]), k = !!O;
-  return /* @__PURE__ */ E(ae, { size: R, isMobile: o, children: [
-    /* @__PURE__ */ l(H, { title: M, children: /* @__PURE__ */ l(
-      z,
+  }, [i, f, l]), y = !!N;
+  return /* @__PURE__ */ w(rt, { size: I, isMobile: t, children: [
+    /* @__PURE__ */ s(E, { title: j, children: /* @__PURE__ */ s(
+      H,
       {
         className: "status-icon",
-        onClick: D,
+        onClick: O,
         sx: {
           display: "flex",
           alignItems: "center",
           justifyContent: "center"
         },
-        children: y ? /* @__PURE__ */ l(L, { fallback: null, children: /* @__PURE__ */ l(y, { style: { width: 16, height: 16 } }) }) : /* @__PURE__ */ l(B, { color: "success", variant: "dot" })
+        children: v ? /* @__PURE__ */ s(F, { fallback: null, children: /* @__PURE__ */ s(v, { style: { width: 16, height: 16 } }) }) : /* @__PURE__ */ s(z, { color: "success", variant: "dot" })
       }
     ) }),
-    k && /* @__PURE__ */ l(
-      X,
+    y && /* @__PURE__ */ s(
+      V,
       {
-        selected: e,
-        data: h,
-        open: k,
-        onSelect: j,
-        onClose: v,
-        timezone: W
+        selected: i,
+        data: f,
+        open: y,
+        onSelect: D,
+        onClose: x,
+        timezone: R
       }
     )
   ] });
 }
-const ae = U("div")`
+const rt = B("div")`
   position: absolute;
-  left: ${({ size: o }) => `${o * 3 / 4}px`};
-  top: ${({ size: o }) => `${o * 0.65}px`};
-  width: ${({ isMobile: o }) => o ? "22px" : "32px"};
-  height: ${({ isMobile: o }) => o ? "22px" : "32px"};
-  border-radius: ${({ isMobile: o }) => o ? "11px" : "16px"};
+  left: ${({ size: t }) => `${t * 3 / 4}px`};
+  top: ${({ size: t }) => `${t * 0.65}px`};
+  width: ${({ isMobile: t }) => t ? "22px" : "32px"};
+  height: ${({ isMobile: t }) => t ? "22px" : "32px"};
+  border-radius: ${({ isMobile: t }) => t ? "11px" : "16px"};
   display: flex;
   align-items: center;
   justify-content: center;
@@ -144,12 +142,12 @@ const ae = U("div")`
 
   .status-icon {
     flex-shrink: 0;
-    width: ${({ isMobile: o }) => o ? "16px" : "26px"};
-    height: ${({ isMobile: o }) => o ? "16px" : "26px"};
-    border-radius: ${({ isMobile: o }) => o ? "8px" : "13px"};
+    width: ${({ isMobile: t }) => t ? "16px" : "26px"};
+    height: ${({ isMobile: t }) => t ? "16px" : "26px"};
+    border-radius: ${({ isMobile: t }) => t ? "8px" : "13px"};
     background-color: #eff1f5;
   }
 `;
 export {
-  ye as default
+  vt as default
 };

package/lib/UserCenter/components/user-info/utils.js

@@ -1,10 +1,10 @@
-import a from "dayjs";
+import n from "dayjs";
 import T from "dayjs/plugin/timezone";
 import g from "dayjs/plugin/utc";
-import { DurationEnum as i } from "../../../@types/index.js";
-a.extend(g);
-a.extend(T);
-const l = 3600, u = 1800, m = 600, d = 300, f = 60, p = 1, M = a.tz.guess(), A = [
+import { DurationEnum as s } from "../../../@types/index.js";
+n.extend(g);
+n.extend(T);
+const u = 3600, l = 1800, m = 600, d = 300, f = 60, p = 1, M = n.tz.guess(), A = [
   "America/New_York",
   "America/Chicago",
   "America/Denver",
@@ -43,51 +43,50 @@ const l = 3600, u = 1800, m = 600, d = 300, f = 60, p = 1, M = a.tz.guess(), A =
   return A;
 }, I = () => h().map((e) => {
   try {
-    const t = a.tz(a(), e).utcOffset() / 60, n = Math.floor(t), s = t % 1 * 60;
-    return { label: `GMT${n >= 0 ? "+" : ""}${n}:${s === 30 ? "30" : "00"}`, value: e };
+    const t = n.tz(n(), e).utcOffset() / 60, a = Math.floor(t), i = t % 1 * 60;
+    return { label: `GMT${a >= 0 ? "+" : ""}${a}:${i === 30 ? "30" : "00"}`, value: e };
   } catch {
     return console.warn(`Timezone ${e} not supported, skipping`), null;
   }
 }).filter((e) => e !== null).sort((e, t) => {
-  const [n, s] = e.label.replace("GMT", "").split(":").map(Number), [c, b] = t.label.replace("GMT", "").split(":").map(Number), y = n * 60 + s;
+  const [a, i] = e.label.replace("GMT", "").split(":").map(Number), [c, b] = t.label.replace("GMT", "").split(":").map(Number), y = a * 60 + i;
   return c * 60 + b - y;
 }).map((e) => ({
   label: `(${e.label}) ${e.value}`,
   value: e.value
-})), N = (r) => /^(https?:\/\/)?((([a-zA-Z\d]([a-zA-Z\d-]*[a-zA-Z\d])*)\.)+[a-zA-Z]{2,}|((\d{1,3}\.){3}\d{1,3}))(:\d+)?(\/[-a-zA-Z\d%_.~+]*)*(\?[;&a-zA-Z\d%_.~+=-]*)?(#[a-zA-Z\d_]*)?$/.test(r), _ = (r) => {
-  var t;
-  let o = ((t = r == null ? void 0 : r.dateRange) == null ? void 0 : t.map((n) => a(n))) ?? [];
-  const e = a();
-  switch (r == null ? void 0 : r.duration) {
-    case i.ThirtyMinutes:
-      o = [e, e.add(30, "minutes")];
+})), N = (o) => /^(https?:\/\/)?((([a-zA-Z\d]([a-zA-Z\d-]*[a-zA-Z\d])*)\.)+[a-zA-Z]{2,}|((\d{1,3}\.){3}\d{1,3}))(:\d+)?(\/[-a-zA-Z\d%_.~+]*)*(\?[;&a-zA-Z\d%_.~+=-]*)?(#[a-zA-Z\d_]*)?$/.test(o), _ = (o) => {
+  let r = o?.dateRange?.map((t) => n(t)) ?? [];
+  const e = n();
+  switch (o?.duration) {
+    case s.ThirtyMinutes:
+      r = [e, e.add(30, "minutes")];
       break;
-    case i.OneHour:
-      o = [e, e.add(1, "hour")];
+    case s.OneHour:
+      r = [e, e.add(1, "hour")];
       break;
-    case i.FourHours:
-      o = [e, e.add(4, "hours")];
+    case s.FourHours:
+      r = [e, e.add(4, "hours")];
       break;
-    case i.Today:
-      o = [e, e.endOf("day")];
+    case s.Today:
+      r = [e, e.endOf("day")];
       break;
-    case i.ThisWeek:
-      o = [e, e.endOf("week")];
+    case s.ThisWeek:
+      r = [e, e.endOf("week")];
       break;
-    case i.NoClear:
-      o = [e, e];
+    case s.NoClear:
+      r = [e, e];
       break;
   }
-  return o.map((n) => n.toDate());
-}, E = (r) => {
-  const o = a();
-  return o.isAfter(a(r[0])) && o.isBefore(a(r[1]));
-}, Z = (r) => {
-  const { duration: o, dateRange: e } = r ?? {};
-  return !o || !e ? !1 : o === i.NoClear || a(e == null ? void 0 : e[0]).isSame(a(e == null ? void 0 : e[1]));
-}, v = (r) => {
-  const o = a(), t = a(r).diff(o, "seconds"), n = (s) => s * 1e3;
-  return t >= l ? n(l) : t >= u ? n(u) : t >= m ? n(m) : t >= d ? n(d) : t >= f ? n(f) : t >= p ? n(p) : 0;
+  return r.map((t) => t.toDate());
+}, E = (o) => {
+  const r = n();
+  return r.isAfter(n(o[0])) && r.isBefore(n(o[1]));
+}, Z = (o) => {
+  const { duration: r, dateRange: e } = o ?? {};
+  return !r || !e ? !1 : r === s.NoClear || n(e?.[0]).isSame(n(e?.[1]));
+}, v = (o) => {
+  const r = n(), t = n(o).diff(r, "seconds"), a = (i) => i * 1e3;
+  return t >= u ? a(u) : t >= l ? a(l) : t >= m ? a(m) : t >= d ? a(d) : t >= f ? a(f) : t >= p ? a(p) : 0;
 }, w = {
   color: "text.primary",
   borderColor: "grey.100",

package/lib/UserSessions/components/user-session-info.js

@@ -1,14 +1,11 @@
-import { jsxs as r, jsx as i } from "react/jsx-runtime";
-import { Box as e, Tooltip as p, Typography as d, Chip as f } from "@mui/material";
-import x from "@arcblock/ux/lib/Avatar";
-import { useCreation as h } from "ahooks";
-function w({ user: t, sessionUser: l }) {
-  const a = h(() => {
-    var o;
-    return (o = (t == null ? void 0 : t.passports) || []) == null ? void 0 : o.find((n) => n.name === l.role);
-  }, [t == null ? void 0 : t.passports, l == null ? void 0 : l.role]);
-  return /* @__PURE__ */ r(
-    e,
+import { jsxs as l, jsx as r } from "react/jsx-runtime";
+import { Box as t, Tooltip as o, Typography as n, Chip as d } from "@mui/material";
+import f from "@arcblock/ux/lib/Avatar";
+import { useCreation as c } from "ahooks";
+function g({ user: i, sessionUser: e }) {
+  const a = c(() => (i?.passports || [])?.find((p) => p.name === e.role), [i?.passports, e?.role]);
+  return /* @__PURE__ */ l(
+    t,
     {
       sx: {
         display: "flex",
@@ -16,20 +13,20 @@ function w({ user: t, sessionUser: l }) {
         gap: 1
       },
       children: [
-        /* @__PURE__ */ i(
-          x,
+        /* @__PURE__ */ r(
+          f,
           {
             size: 40,
             variant: "circle",
             shape: "circle",
-            src: l.avatar,
-            did: l.did,
+            src: e.avatar,
+            did: e.did,
             sx: { flexShrink: 0 }
           }
         ),
-        /* @__PURE__ */ r(e, { sx: { flex: 1, overflow: "hidden" }, children: [
-          /* @__PURE__ */ r(
-            e,
+        /* @__PURE__ */ l(t, { sx: { flex: 1, overflow: "hidden" }, children: [
+          /* @__PURE__ */ l(
+            t,
             {
               sx: {
                 display: "flex",
@@ -37,8 +34,8 @@ function w({ user: t, sessionUser: l }) {
                 gap: 1
               },
               children: [
-                /* @__PURE__ */ i(p, { title: l.fullName, children: /* @__PURE__ */ i(
-                  d,
+                /* @__PURE__ */ r(o, { title: e.fullName, children: /* @__PURE__ */ r(
+                  n,
                   {
                     sx: {
                       whiteSpace: "nowrap",
@@ -46,13 +43,13 @@ function w({ user: t, sessionUser: l }) {
                       textOverflow: "ellipsis",
                       flex: 1
                     },
-                    children: l.fullName
+                    children: e.fullName
                   }
                 ) }),
-                /* @__PURE__ */ i(
-                  f,
+                /* @__PURE__ */ r(
+                  d,
                   {
-                    label: (a == null ? void 0 : a.title) || (a == null ? void 0 : a.name) || "Guest",
+                    label: a?.title || a?.name || "Guest",
                     size: "small",
                     variant: "outlined",
                     sx: {
@@ -72,8 +69,8 @@ function w({ user: t, sessionUser: l }) {
               ]
             }
           ),
-          /* @__PURE__ */ i(p, { title: l.email, children: /* @__PURE__ */ i(
-            d,
+          /* @__PURE__ */ r(o, { title: e.email, children: /* @__PURE__ */ r(
+            n,
             {
               variant: "body2",
               color: "grey",
@@ -82,7 +79,7 @@ function w({ user: t, sessionUser: l }) {
                 overflow: "hidden",
                 textOverflow: "ellipsis"
               },
-              children: l.email
+              children: e.email
             }
           ) })
         ] })
@@ -91,5 +88,5 @@ function w({ user: t, sessionUser: l }) {
   );
 }
 export {
-  w as default
+  g as default
 };