@alphakits/ui 2.4.2 → 2.4.3

package/dist/table/hooks/use-table-data.js

@@ -1,119 +1,123 @@
-import { useState as u, useCallback as c, useEffect as D } from "react";
-import { addQueryParam as I } from "../utils/add-query-param.js";
-import { getQueryFromUrl as R } from "../utils/get-query-from-url.js";
+import { useState as u, useRef as b, useCallback as l, useEffect as E } from "react";
+import { addQueryParam as h } from "../utils/add-query-param.js";
+import { getQueryFromUrl as j } from "../utils/get-query-from-url.js";
 import "query-string";
-import { removeQueryParam as V } from "../utils/remove-query-param.js";
-import { resetQueryParam as Y } from "../utils/reset-query-param.js";
-import { serializeData as b } from "../utils/serialize-data.js";
-const d = {
+import { removeQueryParam as B } from "../utils/remove-query-param.js";
+import { resetQueryParam as G } from "../utils/reset-query-param.js";
+import { serializeData as C } from "../utils/serialize-data.js";
+const p = {
   page: 1,
   limit: 10,
   where: {}
   // остальное добавится по мере нужды (searchText, sort, order и т.д.)
 };
-function E(f, n) {
-  const r = f ?? d, a = {
+function L(w, a) {
+  const r = w ?? p, n = {
     ...r,
-    ...n,
+    ...a,
     where: {
       ...r.where ?? {},
-      ...n.where ?? {}
+      ...a.where ?? {}
     }
   };
-  return a.page && (a.page = +a.page), a.limit && (a.limit = +a.limit), a;
+  return n.page && (n.page = +n.page), n.limit && (n.limit = +n.limit), n;
 }
-function M({ promise: f, records: n, fromPath: r = !0 }) {
-  const [a, p] = u([]), [h, w] = u(!0), [C, A] = u(!1), [L, S] = u(0), [T, U] = u(1), [o, m] = u(void 0), y = c(
-    (t) => r ? R() : t ?? o ?? d,
+function X({ promise: w, records: a, fromPath: r = !0 }) {
+  const [n, A] = u([]), [S, d] = u(!0), [T, Q] = u(!1), [U, q] = u(0), [F, k] = u(1), [c, f] = u(void 0), x = b(w);
+  x.current = w;
+  const v = b(a);
+  v.current = a;
+  const m = l(
+    (t) => r ? j() : t ?? c ?? p,
     // params не включаем при fromPath: иначе setParams на каждом fetch
     // даёт новую ссылку → computeQuery/updateData меняются → бесконечный цикл.
-    r ? [r] : [r, o]
-  ), s = c(
+    r ? [r] : [r, c]
+  ), s = l(
     async (t) => {
-      const e = y(t);
-      if (Array.isArray(n) && (w(!1), p(b(n, e))), m(e), f) {
-        A(!1), w(!0);
+      const e = m(t), i = v.current, y = x.current;
+      if (Array.isArray(i) && (d(!1), A(C(i, e))), r || f(e), y) {
+        Q(!1), d(!0);
         try {
           const {
-            data: { items: i, meta: g }
-          } = await f(e);
-          S(g.totalItems), U(g.totalPages), p(i || []);
+            data: { items: o, meta: g }
+          } = await y(e);
+          q(g.totalItems), k(g.totalPages), A(o || []);
         } catch {
-          A(!0);
+          Q(!0);
         } finally {
-          w(!1);
+          d(!1);
         }
       }
     },
-    [y, n, f]
-  ), q = c(
+    [m, r]
+  ), z = l(
     (t) => {
       if (r) {
-        I(t), s();
+        h(t), s();
         return;
       }
-      const e = E(o, t);
-      m(e), s(e);
+      const e = L(c, t);
+      f(e), s(e);
     },
-    [r, o, s]
-  ), Q = c(
+    [r, c, s]
+  ), D = l(
     (t, e, i) => {
-      const g = t ?? d, l = {
-        ...g,
-        where: { ...g.where ?? {} }
-      }, x = l.where?.[e];
-      if (Array.isArray(x) && i != null) {
-        const v = x.filter((z) => String(z) !== String(i));
-        v.length ? l.where[e] = v : delete l.where[e];
+      const y = t ?? p, o = {
+        ...y,
+        where: { ...y.where ?? {} }
+      }, g = o.where?.[e];
+      if (Array.isArray(g) && i != null) {
+        const R = g.filter((_) => String(_) !== String(i));
+        R.length ? o.where[e] = R : delete o.where[e];
       } else
-        l.where && e in l.where && delete l.where[e];
-      return l;
+        o.where && e in o.where && delete o.where[e];
+      return o;
     },
     []
-  ), F = c(
+  ), I = l(
     (t, e) => {
       if (r) {
-        V(t, e), s();
+        B(t, e), s();
         return;
       }
-      const i = Q(o, t, e);
-      m(i), s(i);
+      const i = D(c, t, e);
+      f(i), s(i);
     },
-    [r, o, s, Q]
-  ), P = c(
+    [r, c, s, D]
+  ), V = l(
     (t) => {
       if (r) {
-        Y(t), s();
+        G(t), s();
         return;
       }
-      const e = E(d, t);
-      m(e), s(e);
+      const e = L(p, t);
+      f(e), s(e);
     },
     [r, s]
   );
-  D(() => {
+  E(() => {
     s();
-  }, [s]), D(() => {
-    if (Array.isArray(n)) {
-      const t = y();
-      m(t), w(!1), p(b(n, t));
+  }, [s]), E(() => {
+    if (Array.isArray(a)) {
+      const t = m();
+      r || f(t), d(!1), A(C(a, t));
     }
-  }, [n, y]);
-  const k = o ?? y();
+  }, [a, m]);
+  const Y = c ?? m();
   return {
-    loading: h,
-    error: C,
-    data: a,
-    total: L,
-    params: k,
-    pagesCount: T,
+    loading: S,
+    error: T,
+    data: n,
+    total: U,
+    params: Y,
+    pagesCount: F,
     updateData: s,
     // НОВОЕ: наружу отдаём универсальные методы для управления параметрами
-    addParam: q,
-    removeParam: F,
-    resetParams: P
+    addParam: z,
+    removeParam: I,
+    resetParams: V
   };
 }
 export {
-  M as useTableData
+  X as useTableData
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@alphakits/ui",
-    "version": "2.4.2",
+    "version": "2.4.3",
     "files": [
         "dist"
     ],