next-recomponents 2.0.43 → 2.0.45

package/dist/index.js

@@ -37185,14 +37185,15 @@ function usePopup() {
   );
   const close = (0, import_react10.useCallback)(
     async (confirmed, value) => {
-      var _a, _b;
+      var _a, _b, _c;
       const prev = { ...popup };
       let visible = false;
       if (confirmed) {
         (_a = prev.onConfirm) == null ? void 0 : _a.call(prev, value);
-      } else if (prev == null ? void 0 : prev.onCancel) {
-        visible = !Boolean(await ((_b = prev.onCancel) == null ? void 0 : _b.call(prev)));
+      } else if (prev == null ? void 0 : prev.onClose) {
+        visible = !Boolean(await ((_b = prev.onClose) == null ? void 0 : _b.call(prev)));
       } else {
+        (_c = prev.onCancel) == null ? void 0 : _c.call(prev);
         visible = false;
       }
       const data = { ...prev, visible, inputValue: "" };
@@ -37218,10 +37219,9 @@ function usePopup() {
         type: "modal",
         message,
         color,
-        // onConfirm: () => {
-        //   resolve();
-        // },
-        onCancel: onClose ? async () => {
+        onConfirm: () => resolve(),
+        onCancel: () => resolve(),
+        onClose: onClose ? async () => {
           return await (onClose == null ? void 0 : onClose());
         } : void 0,
         icons,
@@ -38770,10 +38770,10 @@ function Header({
       "div",
       {
         ref: cellRef,
-        className: "break-words border  text-center relative ",
+        className: "shadow   ",
         style: { zIndex: 10, height: `${padding}px`, maxHeight: "100px" },
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: "flex gap-5 items-center justify-between h-full cursor-pointer", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: "flex justify-between items-center ", children: [
             /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)("div", { className: "flex gap-2", children: [
               hasFilter ? /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
                 "div",
@@ -38801,7 +38801,8 @@ function Header({
             /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
               "div",
               {
-                className: "w-full",
+                className: "font-bold flex truncate text-xs items-center ",
+                style: { height: `${padding}px` },
                 onClick: (e) => {
                   context.setSort({
                     [header]: "TOGGLE"
@@ -39153,10 +39154,14 @@ function HTable({
   return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
     "div",
     {
-      className: [context.className, "bg-white relative"].join(" "),
+      className: [
+        context.className,
+        "bg-white relative",
+        "p-2 border shadow rounded-2xl"
+      ].join(" "),
       ref: tableRef,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: "bg-white px-1 font-bold", children: context.header }),
+        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("div", { className: "bg-white px-1 font-bold rounded-full", children: context.header }),
         /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: "bg-white flex gap-2 items-center", children: [
           context.searchable && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Searchable, { context }),
           context.exportName && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
@@ -39165,8 +39170,13 @@ function HTable({
               onClick: (e) => {
                 context.excel.export(
                   context.data.map((d) => {
-                    const { __select__, __modal__, ...datums } = d;
-                    return datums;
+                    const obj = {};
+                    for (let key in d) {
+                      if (!key.startsWith("_")) {
+                        obj[key] = d[key];
+                      }
+                    }
+                    return obj;
                   })
                 );
               },
@@ -39220,8 +39230,7 @@ function HTable({
             return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
               "div",
               {
-                className: "bg-white",
-                style: { position: "relative" },
+                className: "bg-white relative w-full bg-red-100",
                 children: [
                   /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
                     Header,
@@ -39257,7 +39266,7 @@ function HTable({
           searchedData.map((row, rowIndex) => {
             const items = Object.entries(row);
             return items.map(([key, item], i) => {
-              var _a, _b, _c, _d, _e, _f, _g;
+              var _a, _b, _c, _d, _e;
               if ((_b = (_a = context == null ? void 0 : context.hideColumns) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, key)) return null;
               if (key.startsWith("_") && !key.startsWith("__")) return null;
               if (key == "__modal__") {
@@ -39352,7 +39361,10 @@ function HTable({
                     children: ((_e = (_d = context.buttons[key]) == null ? void 0 : _d.props) == null ? void 0 : _e.children) ? item : null,
                     onClick: async (e) => {
                       var _a2, _b2;
-                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onClick) == null ? void 0 : _b2.call(_a2, e)) || {};
+                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onClick) == null ? void 0 : _b2.call(_a2, {
+                        e,
+                        row
+                      })) || {};
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == (row == null ? void 0 : row.id));
                       newData[index] = { ...newData[index], ...ret };
@@ -39361,7 +39373,10 @@ function HTable({
                     onChange: async (e) => {
                       var _a2, _b2, _c2;
                       const value = e.target.value;
-                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onChange) == null ? void 0 : _b2.call(_a2, e)) || {};
+                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onChange) == null ? void 0 : _b2.call(_a2, {
+                        e,
+                        row
+                      })) || {};
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == (row == null ? void 0 : row.id));
                       if (index >= 0) {
@@ -39374,8 +39389,7 @@ function HTable({
                         }
                       }
                       context.setData(newData);
-                    },
-                    className: `${(_g = (_f = context.buttons[key]) == null ? void 0 : _f.props) == null ? void 0 : _g.className} text-xs w-full`
+                    }
                   }) : ["number", "string"].includes(typeof item) ? valueFormatter({
                     value: item,
                     currentCoin: context.currentCoin

package/dist/index.mjs

@@ -37170,14 +37170,15 @@ function usePopup() {
   );
   const close = useCallback(
     async (confirmed, value) => {
-      var _a, _b;
+      var _a, _b, _c;
       const prev = { ...popup };
       let visible = false;
       if (confirmed) {
         (_a = prev.onConfirm) == null ? void 0 : _a.call(prev, value);
-      } else if (prev == null ? void 0 : prev.onCancel) {
-        visible = !Boolean(await ((_b = prev.onCancel) == null ? void 0 : _b.call(prev)));
+      } else if (prev == null ? void 0 : prev.onClose) {
+        visible = !Boolean(await ((_b = prev.onClose) == null ? void 0 : _b.call(prev)));
       } else {
+        (_c = prev.onCancel) == null ? void 0 : _c.call(prev);
         visible = false;
       }
       const data = { ...prev, visible, inputValue: "" };
@@ -37203,10 +37204,9 @@ function usePopup() {
         type: "modal",
         message,
         color,
-        // onConfirm: () => {
-        //   resolve();
-        // },
-        onCancel: onClose ? async () => {
+        onConfirm: () => resolve(),
+        onCancel: () => resolve(),
+        onClose: onClose ? async () => {
           return await (onClose == null ? void 0 : onClose());
         } : void 0,
         icons,
@@ -38768,10 +38768,10 @@ function Header({
       "div",
       {
         ref: cellRef,
-        className: "break-words border  text-center relative ",
+        className: "shadow   ",
         style: { zIndex: 10, height: `${padding}px`, maxHeight: "100px" },
         children: [
-          /* @__PURE__ */ jsxs23("div", { className: "flex gap-5 items-center justify-between h-full cursor-pointer", children: [
+          /* @__PURE__ */ jsxs23("div", { className: "flex justify-between items-center ", children: [
             /* @__PURE__ */ jsxs23("div", { className: "flex gap-2", children: [
               hasFilter ? /* @__PURE__ */ jsx31(
                 "div",
@@ -38799,7 +38799,8 @@ function Header({
             /* @__PURE__ */ jsx31(
               "div",
               {
-                className: "w-full",
+                className: "font-bold flex truncate text-xs items-center ",
+                style: { height: `${padding}px` },
                 onClick: (e) => {
                   context.setSort({
                     [header]: "TOGGLE"
@@ -39151,10 +39152,14 @@ function HTable({
   return /* @__PURE__ */ jsxs25(
     "div",
     {
-      className: [context.className, "bg-white relative"].join(" "),
+      className: [
+        context.className,
+        "bg-white relative",
+        "p-2 border shadow rounded-2xl"
+      ].join(" "),
       ref: tableRef,
       children: [
-        /* @__PURE__ */ jsx33("div", { className: "bg-white px-1 font-bold", children: context.header }),
+        /* @__PURE__ */ jsx33("div", { className: "bg-white px-1 font-bold rounded-full", children: context.header }),
         /* @__PURE__ */ jsxs25("div", { className: "bg-white flex gap-2 items-center", children: [
           context.searchable && /* @__PURE__ */ jsx33(Searchable, { context }),
           context.exportName && /* @__PURE__ */ jsxs25(
@@ -39163,8 +39168,13 @@ function HTable({
               onClick: (e) => {
                 context.excel.export(
                   context.data.map((d) => {
-                    const { __select__, __modal__, ...datums } = d;
-                    return datums;
+                    const obj = {};
+                    for (let key in d) {
+                      if (!key.startsWith("_")) {
+                        obj[key] = d[key];
+                      }
+                    }
+                    return obj;
                   })
                 );
               },
@@ -39218,8 +39228,7 @@ function HTable({
             return /* @__PURE__ */ jsxs25(
               "div",
               {
-                className: "bg-white",
-                style: { position: "relative" },
+                className: "bg-white relative w-full bg-red-100",
                 children: [
                   /* @__PURE__ */ jsx33(
                     Header,
@@ -39255,7 +39264,7 @@ function HTable({
           searchedData.map((row, rowIndex) => {
             const items = Object.entries(row);
             return items.map(([key, item], i) => {
-              var _a, _b, _c, _d, _e, _f, _g;
+              var _a, _b, _c, _d, _e;
               if ((_b = (_a = context == null ? void 0 : context.hideColumns) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, key)) return null;
               if (key.startsWith("_") && !key.startsWith("__")) return null;
               if (key == "__modal__") {
@@ -39350,7 +39359,10 @@ function HTable({
                     children: ((_e = (_d = context.buttons[key]) == null ? void 0 : _d.props) == null ? void 0 : _e.children) ? item : null,
                     onClick: async (e) => {
                       var _a2, _b2;
-                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onClick) == null ? void 0 : _b2.call(_a2, e)) || {};
+                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onClick) == null ? void 0 : _b2.call(_a2, {
+                        e,
+                        row
+                      })) || {};
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == (row == null ? void 0 : row.id));
                       newData[index] = { ...newData[index], ...ret };
@@ -39359,7 +39371,10 @@ function HTable({
                     onChange: async (e) => {
                       var _a2, _b2, _c2;
                       const value = e.target.value;
-                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onChange) == null ? void 0 : _b2.call(_a2, e)) || {};
+                      const ret = await ((_b2 = (_a2 = context.buttons[key].props) == null ? void 0 : _a2.onChange) == null ? void 0 : _b2.call(_a2, {
+                        e,
+                        row
+                      })) || {};
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == (row == null ? void 0 : row.id));
                       if (index >= 0) {
@@ -39372,8 +39387,7 @@ function HTable({
                         }
                       }
                       context.setData(newData);
-                    },
-                    className: `${(_g = (_f = context.buttons[key]) == null ? void 0 : _f.props) == null ? void 0 : _g.className} text-xs w-full`
+                    }
                   }) : ["number", "string"].includes(typeof item) ? valueFormatter({
                     value: item,
                     currentCoin: context.currentCoin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-recomponents",
-  "version": "2.0.43",
+  "version": "2.0.45",
   "description": "description nueva",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/pop/index.tsx

@@ -24,6 +24,7 @@ export default function usePopup() {
   const open = useCallback(
     (partial: Omit<PopupState, "visible" | "inputValue">) => {
       const { message, ...rest } = partial;
+
       messageRef.current = message as any;
       setPopup({ ...rest, visible: true, inputValue: "" });
     },
@@ -36,9 +37,10 @@ export default function usePopup() {
       let visible = false;
       if (confirmed) {
         prev.onConfirm?.(value);
-      } else if (prev?.onCancel) {
-        visible = !Boolean(await prev.onCancel?.());
+      } else if (prev?.onClose) {
+        visible = !Boolean(await prev.onClose?.());
       } else {
+        prev.onCancel?.();
         visible = false;
       }
 
@@ -76,10 +78,9 @@ export default function usePopup() {
           type: "modal",
           message,
           color,
-          // onConfirm: () => {
-          //   resolve();
-          // },
-          onCancel: onClose
+          onConfirm: () => resolve(),
+          onCancel: () => resolve(),
+          onClose: onClose
             ? async () => {
                 return await onClose?.();
               }

package/src/pop/types.ts

@@ -41,6 +41,7 @@ export interface PopupState {
   color: PopupColor;
   onConfirm?: (value?: string) => void;
   onCancel?: () => void | Promise<boolean | void>;
+  onClose?: () => void | Promise<boolean | void>;
   icons?: boolean;
   full?: boolean;
 }

package/src/table-advanced/h.table.tsx

@@ -153,10 +153,16 @@ export default function HTable({
   });
   return (
     <div
-      className={[context.className, "bg-white relative"].join(" ")}
+      className={[
+        context.className,
+        "bg-white relative",
+        "p-2 border shadow rounded-2xl",
+      ].join(" ")}
       ref={tableRef}
     >
-      <div className="bg-white px-1 font-bold">{context.header}</div>
+      <div className="bg-white px-1 font-bold rounded-full">
+        {context.header}
+      </div>
       <div className="bg-white flex gap-2 items-center">
         {context.searchable && <Searchable context={context} />}
         {context.exportName && (
@@ -164,8 +170,14 @@ export default function HTable({
             onClick={(e) => {
               context.excel.export(
                 context.data.map((d) => {
-                  const { __select__, __modal__, ...datums } = d;
-                  return datums;
+                  const obj: any = {};
+
+                  for (let key in d) {
+                    if (!key.startsWith("_")) {
+                      obj[key] = d[key];
+                    }
+                  }
+                  return obj;
                 }),
               );
             }}
@@ -228,8 +240,8 @@ export default function HTable({
           return (
             <div
               key={header}
-              className="bg-white"
-              style={{ position: "relative" }}
+              className="bg-white relative w-full bg-red-100"
+              // style={{ position: "relative" }}
             >
               <Header
                 padding={padding}
@@ -405,7 +417,10 @@ export default function HTable({
                       : null,
                     onClick: async (e: any) => {
                       const ret =
-                        (await context.buttons[key].props?.onClick?.(e)) || {};
+                        (await context.buttons[key].props?.onClick?.({
+                          e,
+                          row,
+                        })) || {};
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == row?.id);
                       newData[index] = { ...newData[index], ...ret };
@@ -414,7 +429,10 @@ export default function HTable({
                     onChange: async (e: { target: { value: string } }) => {
                       const value = e.target.value;
                       const ret =
-                        (await context.buttons[key].props?.onChange?.(e)) || {};
+                        (await context.buttons[key].props?.onChange?.({
+                          e,
+                          row,
+                        })) || {};
 
                       const newData = [...context.data];
                       const index = newData.findIndex((f) => f.id == row?.id);
@@ -432,7 +450,6 @@ export default function HTable({
 
                       context.setData(newData);
                     },
-                    className: `${context.buttons[key]?.props?.className} text-xs w-full`,
                   })
                 ) : ["number", "string"].includes(typeof item) ? (
                   valueFormatter({

package/src/table-advanced/header.tsx

@@ -121,10 +121,10 @@ export function Header({
       <div className="">
         <div
           ref={cellRef}
-          className={"break-words border  text-center relative "}
+          className={"shadow   "}
           style={{ zIndex: 10, height: `${padding}px`, maxHeight: "100px" }}
         >
-          <div className="flex gap-5 items-center justify-between h-full cursor-pointer">
+          <div className="flex justify-between items-center ">
             <div className="flex gap-2">
               {hasFilter ? (
                 <div
@@ -158,7 +158,8 @@ export function Header({
               </div>
             </div>
             <div
-              className="w-full"
+              className="font-bold flex truncate text-xs items-center "
+              style={{ height: `${padding}px` }}
               onClick={(e) => {
                 context.setSort({
                   [header]: "TOGGLE",