@blocklet/ui-react 3.0.9 → 3.0.10

package/lib/utils.js

@@ -1,65 +1,61 @@
-import R from "semver";
-const d = (n, e, r = "children") => n.map((t) => Array.isArray(t[r]) ? e({
+import H from "semver";
+const d = (n, r, e = "children") => n.map((t) => Array.isArray(t[e]) ? r({
   ...t,
-  [r]: d(t[r], e, r)
-}) : e(t)), S = (n, e = "children") => {
-  const r = [];
-  return d(n, (t) => r.push(t), e), r;
-}, x = (n, e = "children") => {
-  let r = 0;
-  return d(n, () => r++, e), r;
-}, V = (n, e, r = "children") => n.map((t) => ({ ...t })).filter((t) => {
-  const s = t[r];
+  [e]: d(t[e], r, e)
+}) : r(t)), C = (n, r = "children") => {
+  const e = [];
+  return d(n, (t) => e.push(t), r), e;
+}, S = (n, r = "children") => {
+  let e = 0;
+  return d(n, () => e++, r), e;
+}, R = (n, r, e = "children") => n.map((t) => ({ ...t })).filter((t) => {
+  const s = t[e];
   if (Array.isArray(s)) {
-    const o = V(s, e, r);
-    t[r] = o != null && o.length ? o : void 0;
+    const o = R(s, r, e);
+    t[e] = o?.length ? o : void 0;
   }
-  const c = { filteredChildren: t[r], isLeaf: !(s != null && s.length) };
-  return e(t, c);
-}), P = (n) => /^https?:\/\//.test(n), W = (n) => /^[\w-]+:[\w-]+$/.test(n), A = (n) => {
-  if (!n || !(n != null && n.startsWith("/")))
+  const c = { filteredChildren: t[e], isLeaf: !s?.length };
+  return r(t, c);
+}), x = (n) => /^https?:\/\//.test(n), P = (n) => /^[\w-]+:[\w-]+$/.test(n), V = (n) => {
+  if (!n || !n?.startsWith("/"))
     return !1;
-  const e = (s) => s.endsWith("/") ? s : `${s}/`, r = e(window.location.pathname), t = e(new URL(n, window.location.origin).pathname);
-  return r.startsWith(t);
-}, k = (n = []) => {
-  const e = n.map((t, s) => ({ path: t, index: s })).filter((t) => A(t.path));
-  return e != null && e.length ? e.slice(1).reduce((t, s) => t.path.length >= s.path.length ? t : s, e[0]).index : -1;
-}, v = (n, e = {}) => {
-  const { columns: r = 1, breakInside: t = !1, groupHeight: s = 48, itemHeight: c = 24, childrenKey: o = "items" } = e, w = n.reduce((u, m) => {
-    var h;
-    return u + s + (((h = m[o]) == null ? void 0 : h.length) || 0) * c;
-  }, 0), f = Math.ceil(w / r), l = [[]];
+  const r = (s) => s.endsWith("/") ? s : `${s}/`, e = r(window.location.pathname), t = r(new URL(n, window.location.origin).pathname);
+  return e.startsWith(t);
+}, W = (n = []) => {
+  const r = n.map((t, s) => ({ path: t, index: s })).filter((t) => V(t.path));
+  return r?.length ? r.slice(1).reduce((t, s) => t.path.length >= s.path.length ? t : s, r[0]).index : -1;
+}, k = (n, r = {}) => {
+  const { columns: e = 1, breakInside: t = !1, groupHeight: s = 48, itemHeight: c = 24, childrenKey: o = "items" } = r, p = n.reduce((u, g) => u + s + (g[o]?.length || 0) * c, 0), l = Math.ceil(p / e), h = [[]];
   let i = 0, a = 0;
-  const p = f * 0.2, g = (u) => a > f - p && i < r - 1 && a + u > f + p;
+  const m = l * 0.2, f = (u) => a > l - m && i < e - 1 && a + u > l + m;
   return n.forEach((u) => {
-    var h;
-    const m = s + (((h = u[o]) == null ? void 0 : h.length) || 0) * c;
-    t && g(s) && (i++, a = 0, l[i] = []), !t && a > 0 && g(m) && (i++, a = 0, l[i] = []), l[i].push({
+    const g = s + (u[o]?.length || 0) * c;
+    t && f(s) && (i++, a = 0, h[i] = []), !t && a > 0 && f(g) && (i++, a = 0, h[i] = []), h[i].push({
       ...u,
       group: !0
-    }), a += s, u[o] && u[o].forEach((H) => {
-      t && g(c) && (i++, a = 0, l[i] = []), l[i].push({
-        ...H,
+    }), a += s, u[o] && u[o].forEach((w) => {
+      t && f(c) && (i++, a = 0, h[i] = []), h[i].push({
+        ...w,
         group: !1
       }), a += c;
     });
-  }), l;
-}, E = (n, e) => {
-  const r = (c) => {
+  }), h;
+}, v = (n, r) => {
+  const e = (c) => {
     const o = c.match(/^(\d+\.\d+\.\d+(?:-[^-]+?-\d{8}))/);
     return o ? o[1] : c;
-  }, t = r(n), s = r(e);
-  return t === s && n !== e ? !1 : R.gte(t, s);
+  }, t = e(n), s = e(r);
+  return t === s && n !== r ? !1 : H.gte(t, s);
 };
 export {
-  E as compareVersions,
-  x as countRecursive,
-  V as filterRecursive,
-  S as flatRecursive,
-  W as isIconifyString,
-  P as isUrl,
+  v as compareVersions,
+  S as countRecursive,
+  R as filterRecursive,
+  C as flatRecursive,
+  P as isIconifyString,
+  x as isUrl,
   d as mapRecursive,
-  A as matchPath,
-  k as matchPaths,
-  v as splitNavColumns
+  V as matchPath,
+  W as matchPaths,
+  k as splitNavColumns
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -35,12 +35,12 @@
   "dependencies": {
     "@abtnode/constant": "^1.16.44",
     "@abtnode/util": "^1.16.44",
-    "@arcblock/bridge": "3.0.9",
-    "@arcblock/icons": "3.0.9",
-    "@arcblock/react-hooks": "3.0.9",
+    "@arcblock/bridge": "3.0.10",
+    "@arcblock/icons": "3.0.10",
+    "@arcblock/react-hooks": "3.0.10",
     "@arcblock/ws": "^1.20.15",
     "@blocklet/constant": "^1.16.44",
-    "@blocklet/did-space-react": "^1.0.63",
+    "@blocklet/did-space-react": "^1.1.0",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify-icons/tabler": "^1.2.95",
@@ -90,5 +90,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "e2283285cb6e99f09146cde5e1af002e55091619"
+  "gitHead": "8e4b3b4f9cc52c8f1f1d270ab03a3c566073617a"
 }