laif-ds 0.2.61 → 0.2.62

package/dist/components/ui/tables/data-table/components/data-table-column-visibility.js

@@ -1,40 +1,45 @@
 "use client";
-import { jsxs as f, jsx as n } from "react/jsx-runtime";
+import { jsxs as f, jsx as r } from "react/jsx-runtime";
 import { useState as k } from "react";
 import { Button as b } from "../../../button.js";
 import { Icon as C } from "../../../icon.js";
-import { Popover as R, PopoverTrigger as H, PopoverContent as K } from "../../../popover.js";
+import { Popover as H, PopoverTrigger as _, PopoverContent as $ } from "../../../popover.js";
 import { getIconFromColumnType as z } from "../data-table.service.js";
-function U({
-  table: m,
-  visibleColumns: L,
-  hiddenColumns: Y,
+function W({
+  table: u,
+  visibleColumns: Y,
+  hiddenColumns: B,
   i18n: x
 }) {
-  const [c, u] = k({ section: null, position: -1, itemId: null }), [O, T] = k(!1), d = (e) => e?.id ?? e?.columnDef?.id ?? e?.columnDef?.accessorKey ?? "", D = (e) => d(e) === "data-table-integrated-checkbox-column" || e?.columnDef?.enableHiding === !1, V = () => {
-    const e = m?.getState?.().columnOrder || [];
-    return e && e.length > 0 ? [...e] : (m?.getAllLeafColumns?.() || []).map((i) => i.id);
-  }, P = (e, t) => {
+  const [c, m] = k({ section: null, position: -1, itemId: null }), [O, T] = k(!1), d = (e) => e.id, V = (e) => {
+    const t = e.columnDef.meta?.headerLabel;
+    if (t) return String(t);
+    const i = e.columnDef.header;
+    return typeof i == "string" ? i : d(e);
+  }, D = (e) => d(e) === "data-table-integrated-checkbox-column" || e.columnDef.enableHiding === !1, P = () => {
+    const e = u?.getState?.().columnOrder || [];
+    return e && e.length > 0 ? [...e] : (u?.getAllLeafColumns?.() || []).map((i) => i.id);
+  }, j = (e, t) => {
     e.dataTransfer.setData("text/column-id", t), e.dataTransfer.effectAllowed = "move", T(!0);
-  }, j = () => {
-    T(!1), u({ section: null, position: -1, itemId: null });
-  }, A = (e) => {
+  }, A = () => {
+    T(!1), m({ section: null, position: -1, itemId: null });
+  }, E = (e) => {
     const t = e.currentTarget, i = Array.from(t.querySelectorAll("[data-column-item]")), o = e.clientY;
-    for (let r = 0; r < i.length; r++) {
-      const a = i[r].getBoundingClientRect(), l = a.top + a.height / 2;
+    for (let n = 0; n < i.length; n++) {
+      const a = i[n].getBoundingClientRect(), l = a.top + a.height / 2;
       if (o < l)
-        return r;
+        return n;
     }
     return i.length;
   }, w = (e, t, i) => {
-    const o = m?.getColumn?.(e);
+    const o = u?.getColumn?.(e);
     if (!o || D(o))
       return;
-    const r = o.getIsVisible(), s = t === "visible" ? g : N;
+    const n = o.getIsVisible(), s = t === "visible" ? g : N;
     if (t === "visible" && i === 0)
       return;
-    (t === "visible" && !r || t === "hidden" && r) && o.toggleVisibility(t === "visible");
-    const a = V(), l = s.map(d), p = a.indexOf(e);
+    (t === "visible" && !n || t === "hidden" && n) && o.toggleVisibility(t === "visible");
+    const a = P(), l = s.map(d), p = a.indexOf(e);
     if (p === -1) return;
     const h = [...a];
     h.splice(p, 1);
@@ -46,19 +51,19 @@ function U({
       const I = l[l.length - 1];
       I && (v = h.indexOf(I) + 1);
     }
-    h.splice(v, 0, e), m.setColumnOrder(h);
+    h.splice(v, 0, e), u.setColumnOrder(h);
   }, S = (e, t, i, o) => {
     e.preventDefault(), e.stopPropagation(), e.dataTransfer.dropEffect = "move";
-    const r = e.currentTarget.getBoundingClientRect(), s = e.clientY, a = r.top + r.height / 2, l = s < a ? o : o + 1;
-    u({
+    const n = e.currentTarget.getBoundingClientRect(), s = e.clientY, a = n.top + n.height / 2, l = s < a ? o : o + 1;
+    m({
       section: t,
       position: l,
       itemId: i
     });
-  }, E = (e) => (t) => {
+  }, L = (e) => (t) => {
     t.preventDefault(), t.dataTransfer.dropEffect = "move";
-    const i = A(t);
-    u({
+    const i = E(t);
+    m({
       section: e,
       position: e === "visible" && i === 0 ? 1 : i,
       itemId: null
@@ -67,20 +72,20 @@ function U({
     t.preventDefault(), t.stopPropagation();
     const i = t.dataTransfer.getData("text/column-id");
     if (!i) return;
-    const o = c.position !== -1 ? c.position : A(t);
-    w(i, e, e === "visible" && o === 0 ? 1 : o), u({ section: null, position: -1, itemId: null });
-  }, B = V(), F = (m?.getAllLeafColumns?.() || []).map(
+    const o = c.position !== -1 ? c.position : E(t);
+    w(i, e, e === "visible" && o === 0 ? 1 : o), m({ section: null, position: -1, itemId: null });
+  }, F = P(), G = (u?.getAllLeafColumns?.() || []).map(
     (e) => e.id
-  ), G = new Map(
-    F.map((e, t) => [e, t])
+  ), R = new Map(
+    G.map((e, t) => [e, t])
   ), y = (e) => {
-    const t = B.indexOf(e);
+    const t = F.indexOf(e);
     if (t !== -1) return t;
-    const i = G.get(e);
+    const i = R.get(e);
     return i !== void 0 ? i : Number.MAX_SAFE_INTEGER;
-  }, g = [...L].filter((e) => !D(e)).sort((e, t) => y(d(e)) - y(d(t))), N = [...Y].filter((e) => !D(e)).sort((e, t) => y(d(e)) - y(d(t)));
-  return /* @__PURE__ */ f(R, { children: [
-    /* @__PURE__ */ n(H, { asChild: !0, children: /* @__PURE__ */ n(
+  }, g = [...Y].filter((e) => !D(e)).sort((e, t) => y(d(e)) - y(d(t))), N = [...B].filter((e) => !D(e)).sort((e, t) => y(d(e)) - y(d(t)));
+  return /* @__PURE__ */ f(H, { children: [
+    /* @__PURE__ */ r(_, { asChild: !0, children: /* @__PURE__ */ r(
       b,
       {
         className: "h-6 w-6",
@@ -89,28 +94,28 @@ function U({
         variant: "ghost"
       }
     ) }),
-    /* @__PURE__ */ f(K, { className: "flex flex-col gap-2 px-3 py-2", align: "end", children: [
+    /* @__PURE__ */ f($, { className: "flex flex-col gap-2 px-3 py-2", align: "end", children: [
       g.length > 0 && /* @__PURE__ */ f(
         "div",
         {
           className: "flex max-h-[250px] flex-col",
-          onDragOver: E("visible"),
+          onDragOver: L("visible"),
           onDrop: M("visible"),
           children: [
             /* @__PURE__ */ f("div", { className: "flex flex-row items-center justify-between gap-2", children: [
-              /* @__PURE__ */ n("div", { className: "text-d-foreground text-sm", children: x.columnVisibility.visibleColumns }),
-              /* @__PURE__ */ n(
+              /* @__PURE__ */ r("div", { className: "text-d-foreground text-sm", children: x.columnVisibility.visibleColumns }),
+              /* @__PURE__ */ r(
                 b,
                 {
                   variant: "ghost",
                   size: "sm",
                   className: "text-xs",
                   onClick: () => {
-                    m.setColumnVisibility(() => {
+                    u.setColumnVisibility(() => {
                       const e = [...g, ...N], t = d(g[0] ?? e[0]);
                       return e.reduce(
-                        (o, r) => {
-                          const s = d(r);
+                        (o, n) => {
+                          const s = d(n);
                           return s && (o[s] = s === t), o;
                         },
                         {}
@@ -121,23 +126,23 @@ function U({
                 }
               )
             ] }),
-            /* @__PURE__ */ n("div", { className: "border-d-border flex min-h-0 flex-1 flex-col overflow-y-auto border-b", children: g.map((e, t) => {
-              const i = d(e), o = t === 0, r = D(e), s = c.section === "visible" && c.position === t && t > 0, a = c.section === "visible" && c.position === t + 1;
+            /* @__PURE__ */ r("div", { className: "border-d-border flex min-h-0 flex-1 flex-col overflow-y-auto border-b", children: g.map((e, t) => {
+              const i = d(e), o = t === 0, n = D(e), s = c.section === "visible" && c.position === t && t > 0, a = c.section === "visible" && c.position === t + 1;
               return /* @__PURE__ */ f("div", { className: "relative", children: [
-                s && /* @__PURE__ */ n("div", { className: "bg-d-primary absolute -top-1 right-0 left-0 z-10 h-0.5 rounded-full" }),
-                /* @__PURE__ */ n(
+                s && /* @__PURE__ */ r("div", { className: "bg-d-primary absolute -top-1 right-0 left-0 z-10 h-0.5 rounded-full" }),
+                /* @__PURE__ */ r(
                   "div",
                   {
                     "data-column-item": !0,
-                    draggable: !o && !r,
+                    draggable: !o && !n,
                     onDragStart: (l) => {
-                      if (o || r) {
+                      if (o || n) {
                         l.preventDefault();
                         return;
                       }
-                      P(l, i);
+                      j(l, i);
                     },
-                    onDragEnd: j,
+                    onDragEnd: A,
                     onDragOver: (l) => {
                       if (t === 0) {
                         l.dataTransfer.dropEffect = "none";
@@ -152,25 +157,25 @@ function U({
                         p,
                         "visible",
                         Math.max(1, t)
-                      ), u({
+                      ), m({
                         section: null,
                         position: -1,
                         itemId: null
                       });
                     },
-                    className: `rounded transition-all duration-150 ${o || r ? "cursor-not-allowed opacity-60" : O && c.itemId === i ? "scale-95 opacity-50" : "hover:bg-d-foreground/5"}`,
-                    children: /* @__PURE__ */ n(
+                    className: `rounded transition-all duration-150 ${o || n ? "cursor-not-allowed opacity-60" : O && c.itemId === i ? "scale-95 opacity-50" : "hover:bg-d-foreground/5"}`,
+                    children: /* @__PURE__ */ r(
                       b,
                       {
                         variant: "ghost",
                         className: "w-full cursor-grab justify-start",
                         iconLeft: "GripVertical",
                         onClick: () => {
-                          r || e.toggleVisibility();
+                          n || e.toggleVisibility();
                         },
-                        disabled: i === d(g[0]) || r,
+                        disabled: i === d(g[0]) || n,
                         children: /* @__PURE__ */ f("div", { className: "flex w-full flex-row items-center justify-between gap-1", children: [
-                          /* @__PURE__ */ n(
+                          /* @__PURE__ */ r(
                             C,
                             {
                               name: z(
@@ -179,15 +184,15 @@ function U({
                               className: "h-4 w-4"
                             }
                           ),
-                          /* @__PURE__ */ n("div", { className: "flex flex-1", children: e.columnDef.header?.toString() }),
-                          /* @__PURE__ */ n(C, { name: "Eye" })
+                          /* @__PURE__ */ r("div", { className: "flex flex-1", children: V(e) }),
+                          /* @__PURE__ */ r(C, { name: "Eye" })
                         ] })
                       },
                       i
                     )
                   }
                 ),
-                a && /* @__PURE__ */ n("div", { className: "bg-d-primary absolute right-0 -bottom-1 left-0 z-10 h-0.5 rounded-full" })
+                a && /* @__PURE__ */ r("div", { className: "bg-d-primary absolute right-0 -bottom-1 left-0 z-10 h-0.5 rounded-full" })
               ] }, i);
             }) })
           ]
@@ -197,45 +202,45 @@ function U({
         "div",
         {
           className: "flex max-h-[250px] flex-col",
-          onDragOver: E("hidden"),
+          onDragOver: L("hidden"),
           onDrop: M("hidden"),
           children: [
             /* @__PURE__ */ f("div", { className: "flex flex-row items-center justify-between gap-2", children: [
-              /* @__PURE__ */ n("div", { className: "text-d-foreground text-sm", children: x.columnVisibility.hiddenColumns }),
-              /* @__PURE__ */ n(
+              /* @__PURE__ */ r("div", { className: "text-d-foreground text-sm", children: x.columnVisibility.hiddenColumns }),
+              /* @__PURE__ */ r(
                 b,
                 {
                   variant: "ghost",
                   size: "sm",
                   className: "text-xs",
-                  onClick: () => m.setColumnVisibility({}),
+                  onClick: () => u.setColumnVisibility({}),
                   children: x.columnVisibility.showAll
                 }
               )
             ] }),
-            /* @__PURE__ */ n("div", { className: "border-d-border flex min-h-0 flex-1 flex-col overflow-y-auto border-b", children: N.map((e, t) => {
-              const i = d(e), o = c.section === "hidden" && c.position === t, r = c.section === "hidden" && c.position === t + 1;
+            /* @__PURE__ */ r("div", { className: "border-d-border flex min-h-0 flex-1 flex-col overflow-y-auto border-b", children: N.map((e, t) => {
+              const i = d(e), o = c.section === "hidden" && c.position === t, n = c.section === "hidden" && c.position === t + 1;
               return /* @__PURE__ */ f("div", { className: "relative", children: [
-                o && /* @__PURE__ */ n("div", { className: "bg-d-primary absolute -top-1 right-0 left-0 z-10 h-0.5 rounded-full" }),
-                /* @__PURE__ */ n(
+                o && /* @__PURE__ */ r("div", { className: "bg-d-primary absolute -top-1 right-0 left-0 z-10 h-0.5 rounded-full" }),
+                /* @__PURE__ */ r(
                   "div",
                   {
                     "data-column-item": !0,
                     draggable: !0,
-                    onDragStart: (s) => P(s, i),
-                    onDragEnd: j,
+                    onDragStart: (s) => j(s, i),
+                    onDragEnd: A,
                     onDragOver: (s) => S(s, "hidden", i, t),
                     onDrop: (s) => {
                       s.preventDefault(), s.stopPropagation();
                       const a = s.dataTransfer.getData("text/column-id");
-                      a && a !== i && w(a, "hidden", t), u({
+                      a && a !== i && w(a, "hidden", t), m({
                         section: null,
                         position: -1,
                         itemId: null
                       });
                     },
                     className: `rounded transition-all duration-150 ${O && c.itemId === i ? "scale-95 opacity-50" : "hover:bg-d-foreground/5"}`,
-                    children: /* @__PURE__ */ n(
+                    children: /* @__PURE__ */ r(
                       b,
                       {
                         variant: "ghost",
@@ -243,7 +248,7 @@ function U({
                         iconLeft: "GripVertical",
                         onClick: () => e.toggleVisibility(),
                         children: /* @__PURE__ */ f("div", { className: "flex w-full flex-row items-center justify-between gap-1", children: [
-                          /* @__PURE__ */ n(
+                          /* @__PURE__ */ r(
                             C,
                             {
                               name: z(
@@ -252,15 +257,15 @@ function U({
                               className: "h-4 w-4"
                             }
                           ),
-                          /* @__PURE__ */ n("div", { className: "flex flex-1", children: e.columnDef.header?.toString() }),
-                          /* @__PURE__ */ n(C, { name: "EyeOff" })
+                          /* @__PURE__ */ r("div", { className: "flex flex-1", children: V(e) }),
+                          /* @__PURE__ */ r(C, { name: "EyeOff" })
                         ] })
                       },
                       i
                     )
                   }
                 ),
-                r && /* @__PURE__ */ n("div", { className: "bg-d-primary absolute right-0 -bottom-1 left-0 z-10 h-0.5 rounded-full" })
+                n && /* @__PURE__ */ r("div", { className: "bg-d-primary absolute right-0 -bottom-1 left-0 z-10 h-0.5 rounded-full" })
               ] }, i);
             }) })
           ]
@@ -270,5 +275,5 @@ function U({
   ] });
 }
 export {
-  U as DataTableColumnVisibility
+  W as DataTableColumnVisibility
 };

package/dist/components/ui/tables/data-table/components/data-table-filters.js

@@ -1,11 +1,11 @@
 "use client";
 import { jsxs as p, Fragment as A, jsx as o } from "react/jsx-runtime";
 import { useState as q, useEffect as $ } from "react";
-import { Badge as y } from "../../../badge.js";
+import { Badge as f } from "../../../badge.js";
 import { Button as N } from "../../../button.js";
-import { Icon as f } from "../../../icon.js";
+import { Icon as y } from "../../../icon.js";
 import { Input as E } from "../../../input.js";
-import { Popover as S, PopoverTrigger as _, PopoverContent as D } from "../../../popover.js";
+import { Popover as S, PopoverTrigger as D, PopoverContent as _ } from "../../../popover.js";
 import { getIconFromColumnType as M } from "../data-table.service.js";
 import { DataTableAdvancedFilterComponent as R } from "./data-table-advanced-filter.js";
 import { DataTableStringFilter as z, DataTableNumberFilter as H, DataTableBooleanFilter as J, DataTableDateFilter as K, DataTableDateTimeFilter as Q, DataTableListSingleSelectFilter as U, DataTableListMultiSelectFilter as V } from "./data-table-simple-filters.js";
@@ -99,18 +99,18 @@ function se({
     b
   ]), /* @__PURE__ */ p(A, { children: [
     m && /* @__PURE__ */ p(S, { children: [
-      /* @__PURE__ */ o(_, { asChild: !0, children: /* @__PURE__ */ p(
-        y,
+      /* @__PURE__ */ o(D, { asChild: !0, children: /* @__PURE__ */ p(
+        f,
         {
           className: "hover:border-d-border cursor-pointer hover:border",
           variant: "default",
           children: [
-            /* @__PURE__ */ o(f, { name: "ListFilter" }),
+            /* @__PURE__ */ o(y, { name: "ListFilter" }),
             s.filters.advancedFilter
           ]
         }
       ) }),
-      /* @__PURE__ */ o(D, { className: "w-[800px]", align: "start", children: /* @__PURE__ */ o(
+      /* @__PURE__ */ o(_, { className: "w-[800px]", align: "start", children: /* @__PURE__ */ o(
         R,
         {
           columns: h,
@@ -134,18 +134,18 @@ function se({
             });
           },
           children: [
-            /* @__PURE__ */ o(_, { asChild: !0, children: /* @__PURE__ */ p(
-              y,
+            /* @__PURE__ */ o(D, { asChild: !0, children: /* @__PURE__ */ p(
+              f,
               {
                 variant: (e.value === void 0 || e.value === "") && !(e.operator === "eq_null" || e.operator === "n_eq_null" || e.operator === "checked" || e.operator === "unchecked") ? "ghost" : "default",
                 className: `hover:border-d-border flex cursor-pointer items-center gap-1 hover:border ${c && "border-d-foreground border"}`,
                 children: [
-                  /* @__PURE__ */ o(f, { name: "Filter" }),
+                  /* @__PURE__ */ o(y, { name: "Filter" }),
                   e.columnLabel || s.filters.value
                 ]
               }
             ) }),
-            /* @__PURE__ */ p(D, { align: "start", children: [
+            /* @__PURE__ */ p(_, { align: "start", children: [
               e.columnType === "string" && /* @__PURE__ */ o(
                 z,
                 {
@@ -229,18 +229,18 @@ function se({
           });
         },
         children: [
-          /* @__PURE__ */ o(_, { asChild: !0, children: /* @__PURE__ */ p(
-            y,
+          /* @__PURE__ */ o(D, { asChild: !0, children: /* @__PURE__ */ p(
+            f,
             {
               variant: "ghost",
               className: `hover:border-d-border flex cursor-pointer items-center gap-1 hover:border ${j && "border-d-foreground border"}`,
               children: [
-                /* @__PURE__ */ o(f, { name: "FunnelPlus" }),
+                /* @__PURE__ */ o(y, { name: "FunnelPlus" }),
                 s.filters.addFilter
               ]
             }
           ) }),
-          /* @__PURE__ */ p(D, { className: "p-2", align: "start", children: [
+          /* @__PURE__ */ p(_, { className: "p-2", align: "start", children: [
             /* @__PURE__ */ o(
               E,
               {
@@ -260,7 +260,7 @@ function se({
                   e.column.columnDef.meta?.type
                 ),
                 onClick: () => G(e),
-                children: e.column.columnDef.header?.toString()
+                children: e.column.columnDef.meta?.headerLabel || (typeof e.column.columnDef.header == "string" ? e.column.columnDef.header : "") || e.column.id
               }
             ) }, e.id)) }),
             /* @__PURE__ */ o("div", { className: "border-d-border mb-1 w-full border-b" }),

package/dist/components/ui/tables/data-table/components/data-table-sorting.js

@@ -2,12 +2,12 @@
 import { jsxs as a, jsx as l } from "react/jsx-runtime";
 import { AppSelect as h } from "../../../app-select.js";
 import { Badge as S } from "../../../badge.js";
-import { Button as f } from "../../../button.js";
+import { Button as g } from "../../../button.js";
 import { Icon as z } from "../../../icon.js";
-import { Popover as C, PopoverTrigger as k, PopoverContent as A } from "../../../popover.js";
-function T({
+import { Popover as C, PopoverTrigger as D, PopoverContent as L } from "../../../popover.js";
+function B({
   table: c,
-  sortedColumns: g = [],
+  sortedColumns: f = [],
   sortableColumns: d,
   i18n: o,
   maxSortedColumns: m = 3
@@ -33,10 +33,10 @@ function T({
     c.setSorting(t);
   };
   return /* @__PURE__ */ a(C, { children: [
-    /* @__PURE__ */ l(k, { asChild: !0, children: /* @__PURE__ */ a(
+    /* @__PURE__ */ l(D, { asChild: !0, children: /* @__PURE__ */ a(
       S,
       {
-        variant: g.length > 0 ? "default" : "ghost",
+        variant: f.length > 0 ? "default" : "ghost",
         className: "hover:border-d-border cursor-pointer hover:border",
         children: [
           /* @__PURE__ */ l(z, { name: "ArrowUpDown" }),
@@ -44,14 +44,14 @@ function T({
         ]
       }
     ) }),
-    /* @__PURE__ */ a(A, { className: "flex w-[400px] flex-col gap-2", align: "start", children: [
+    /* @__PURE__ */ a(L, { className: "flex w-[400px] flex-col gap-2", align: "start", children: [
       /* @__PURE__ */ l("div", { className: "text-d-foreground text-md font-semibold", children: o.sorting.sorting }),
-      g.length > 0 && /* @__PURE__ */ a("div", { className: "flex flex-col gap-2", children: [
+      f.length > 0 && /* @__PURE__ */ a("div", { className: "flex flex-col gap-2", children: [
         /* @__PURE__ */ a("div", { className: "flex w-full flex-row gap-1 pr-9 text-sm", children: [
           /* @__PURE__ */ l("div", { className: "flex flex-1", children: o.sorting.column }),
           /* @__PURE__ */ l("div", { className: "flex flex-1", children: o.sorting.order })
         ] }),
-        g.map((n, t) => /* @__PURE__ */ a("div", { className: "flex w-full flex-row items-end gap-1", children: [
+        f.map((n, t) => /* @__PURE__ */ a("div", { className: "flex w-full flex-row items-end gap-1", children: [
           /* @__PURE__ */ l(
             h,
             {
@@ -62,7 +62,7 @@ function T({
                 return s === n?.column.id || !p.has(s);
               }).map((e) => ({
                 value: e.column.id,
-                label: e.column.columnDef.header?.toString() || e.column.id
+                label: e.column.columnDef.meta?.headerLabel || (typeof e.column.columnDef.header == "string" ? e.column.columnDef.header : "") || e.column.id
               })),
               value: n?.column.id,
               onValueChange: (e) => {
@@ -86,7 +86,7 @@ function T({
             }
           ),
           /* @__PURE__ */ l(
-            f,
+            g,
             {
               variant: "ghost-destructive",
               size: "sm",
@@ -98,7 +98,7 @@ function T({
       ] }),
       /* @__PURE__ */ a("div", { className: "flex w-full gap-2", children: [
         /* @__PURE__ */ l(
-          f,
+          g,
           {
             className: "flex flex-1",
             variant: "ghost-destructive",
@@ -109,7 +109,7 @@ function T({
           }
         ),
         /* @__PURE__ */ l(
-          f,
+          g,
           {
             className: "flex flex-1",
             variant: "ghost",
@@ -124,5 +124,5 @@ function T({
   ] });
 }
 export {
-  T as DataTableSortingComponent
+  B as DataTableSortingComponent
 };