@3sc/common-component 0.0.474 → 0.0.476

package/dist/index.es.js

@@ -43686,11 +43686,11 @@ const jw = {
   ) || null;
   const m = Tr((y == null ? void 0 : y.columns) || []);
   if (!r && t && l) {
-    let k = (u && qu({ definitions: u, childUniqueKey: i })) ?? qu({ definitions: c, childUniqueKey: i });
+    let k = (u && qu({ col: u, childUniqueKey: i, definitions: c })) ?? qu({ col: c, childUniqueKey: i });
     const E = k.filter((P) => !m[P.key]), R = y && ((w = y == null ? void 0 : y.columns) == null ? void 0 : w.some(
       (P) => (P == null ? void 0 : P.children) && P.children[i]
     ));
-    if (E.length && (!y || R == !1) && l) {
+    if (l && (E.length || R === !1)) {
       if (R == !1) {
         const P = Tr(k);
         k = (O = y == null ? void 0 : y.columns) == null ? void 0 : O.map((I) => {
@@ -43728,7 +43728,7 @@ const jw = {
     m,
     u,
     i
-  )) ?? u ?? qu({ definitions: c });
+  )) ?? u ?? qu({ col: c });
   const b = [], x = Tr(u);
   for (const k of c) {
     const E = x[k.key] || {}, R = f[k.key] || {}, P = m[k.key], I = Tr(E.children || []), j = Tr(R.children || []);
@@ -43745,18 +43745,24 @@ const jw = {
     }))), b.push(M);
   }
   return b.sort((k, E) => k.sequenceId - E.sequenceId);
-}, UW = (e) => e.sort((t, n) => t.sequenceId - n.sequenceId), na = (e, t) => e == null ? void 0 : e.map((n) => ({
-  id: n.id,
-  key: n.key,
-  sequenceId: n.sequenceId || n.id,
-  isHidden: n.isHidden || !1,
-  style: n.style || {},
-  ...(n == null ? void 0 : n.children) && {
-    children: t ? {
-      [t]: na(n.children)
-    } : na(n.children)
-  }
-})), Tr = (e) => Array.isArray(e) && (e == null ? void 0 : e.reduce((t, n) => (t[n.key] = n, t), {})), qu = ({ definitions: e, childUniqueKey: t }) => na(e, t), HW = (e, t, n) => t.map((o) => {
+}, UW = (e) => e.sort((t, n) => t.sequenceId - n.sequenceId), na = ({ columns: e, childUniqueKey: t, definitions: n }) => {
+  let r = n || e;
+  return e == null ? void 0 : e.map((o) => {
+    let i = r == null ? void 0 : r.find((a) => (a == null ? void 0 : a.key) === (o == null ? void 0 : o.key));
+    return {
+      id: o.id,
+      key: o.key,
+      sequenceId: o.sequenceId || o.id,
+      isHidden: o.isHidden || !1,
+      style: o.style || (i == null ? void 0 : i.style) || {},
+      ...(o == null ? void 0 : o.children) && {
+        children: t ? {
+          [t]: na({ columns: o.children, definitions: i == null ? void 0 : i.children })
+        } : na({ columns: o.children, definitions: i == null ? void 0 : i.children })
+      }
+    };
+  });
+}, Tr = (e) => Array.isArray(e) && (e == null ? void 0 : e.reduce((t, n) => (t[n.key] = n, t), {})), qu = ({ col: e, childUniqueKey: t, definitions: n }) => na({ columns: e, childUniqueKey: t, definitions: n }), HW = (e, t, n) => t.map((o) => {
   const i = e[o.key], a = o.children ? o.children.map((l) => {
     var d;
     const c = Tr(Array.isArray(i == null ? void 0 : i.children) ? i == null ? void 0 : i.children : (d = i == null ? void 0 : i.children) == null ? void 0 : d[n]), u = c == null ? void 0 : c[l.key];
@@ -44242,7 +44248,7 @@ const QW = ve.memo(
     let m = h.reduce(
       (k, E) => k == null ? void 0 : k[E],
       y
-    ) || null, b = na(p, i);
+    ) || null, b = na({ columns: p, childUniqueKey: i });
     const x = Tr(m == null ? void 0 : m.columns);
     b = b == null ? void 0 : b.map((k) => {
       var P, I;
@@ -44308,7 +44314,7 @@ const QW = ve.memo(
   let i = o.reduce(
     (u, d) => u == null ? void 0 : u[d],
     e
-  ) || null, a = na(t == null ? void 0 : t.grid, r);
+  ) || null, a = na({ columns: t == null ? void 0 : t.grid, childUniqueKey: r });
   const l = Tr(i == null ? void 0 : i.columns);
   a = a == null ? void 0 : a.map((u) => {
     var p, h;