@moontra/moonui-pro 2.25.9 → 2.25.11

package/dist/index.mjs

@@ -64323,10 +64323,10 @@ function DashboardGrid({
   className,
   glassmorphism = false,
   breakpoints = { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 },
-  cols = { lg: 12, md: 8, sm: 4, xs: 2, xxs: 1 },
+  cols = { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 },
   rowHeight = 80,
-  margin = [16, 16],
-  containerPadding = [16, 16]
+  margin = [20, 20],
+  containerPadding = [20, 20]
 }) {
   const [layouts, setLayouts] = t__default.useState({});
   const [currentBreakpoint, setCurrentBreakpoint] = t__default.useState("lg");
@@ -64361,61 +64361,76 @@ function DashboardGrid({
     const baseLayout = widgets.map((widget, index2) => ({
       i: widget.id,
       x: widget.position?.x ?? index2 * 3 % 12,
-      y: widget.position?.y ?? Math.floor(index2 * 3 / 12) * 3,
+      y: widget.position?.y ?? Math.floor(index2 / 4) * 3,
       w: widget.size?.w ?? 3,
       h: widget.size?.h ?? 3,
-      minW: widget.size?.minW || 2,
+      minW: widget.size?.minW || 1,
       maxW: widget.size?.maxW || 12,
       minH: widget.size?.minH || 2,
       maxH: widget.size?.maxH || 8,
       isDraggable: editMode && !lockedWidgets.has(widget.id) && widget.permissions?.canMove !== false,
       isResizable: editMode && !lockedWidgets.has(widget.id) && widget.permissions?.canResize !== false
     }));
-    const sortedLayout = [...baseLayout].sort((a, b) => {
-      if (a.y === b.y)
-        return a.x - b.x;
-      return a.y - b.y;
-    });
+    const preventCollisions = (items, colCount) => {
+      const sorted = [...items].sort((a, b) => {
+        if (a.y === b.y)
+          return a.x - b.x;
+        return a.y - b.y;
+      });
+      let currentY = 0;
+      const positioned = [];
+      for (const item of sorted) {
+        const adjustedW = Math.min(item.w, colCount);
+        let finalY = currentY;
+        for (const prev of positioned) {
+          const prevBottom = prev.y + prev.h;
+          if (prev.x < adjustedW && prev.x + prev.w > 0 && prevBottom > finalY) {
+            finalY = prevBottom;
+          }
+        }
+        positioned.push({
+          ...item,
+          w: adjustedW,
+          x: 0,
+          y: finalY
+        });
+        currentY = finalY + item.h;
+      }
+      return positioned;
+    };
     return {
       lg: baseLayout,
-      md: sortedLayout.map((item, index2) => {
-        const maxW = Math.min(item.w, 4);
+      md: widgets.map((widget, index2) => {
         const row = Math.floor(index2 / 2);
-        const col = index2 % 2 * 4;
+        const col = index2 % 2 * 5;
         return {
-          ...item,
-          w: maxW,
+          i: widget.id,
+          w: Math.min(widget.size?.w ?? 5, 5),
+          h: widget.size?.h ?? 3,
           x: col,
-          y: row * 3,
-          h: Math.min(item.h, 3)
-        };
-      }),
-      sm: sortedLayout.map((item, index2) => {
-        const maxW = Math.min(item.w, 4);
-        return {
-          ...item,
-          w: maxW,
-          x: 0,
-          y: index2 * 3,
-          h: Math.min(item.h, 3)
+          y: row * 4,
+          minW: 2,
+          minH: 2,
+          isDraggable: editMode && !lockedWidgets.has(widget.id),
+          isResizable: editMode && !lockedWidgets.has(widget.id)
         };
       }),
-      xs: sortedLayout.map((item, index2) => ({
+      sm: preventCollisions(baseLayout.map((item) => ({
         ...item,
-        w: 2,
-        // Full width on mobile
-        x: 0,
-        y: index2 * 2,
-        h: Math.min(item.h, 2)
-      })),
-      xxs: sortedLayout.map((item, index2) => ({
+        w: Math.min(item.w, 6),
+        h: Math.min(item.h, 4)
+      })), 6),
+      xs: preventCollisions(baseLayout.map((item) => ({
+        ...item,
+        w: Math.min(item.w, 4),
+        h: Math.min(item.h, 3)
+      })), 4),
+      xxs: preventCollisions(baseLayout.map((item) => ({
         ...item,
-        w: 1,
+        w: 2,
         // Full width on extra small
-        x: 0,
-        y: index2 * 2,
-        h: Math.min(item.h, 2)
-      }))
+        h: Math.min(item.h, 3)
+      })), 2)
     };
   };
   const toggleWidgetLock = (widgetId) => {
@@ -64659,12 +64674,12 @@ function DashboardGrid({
           draggableHandle: ".drag-handle",
           isDraggable: editMode,
           isResizable: editMode,
-          compactType,
-          preventCollision: false,
+          compactType: "vertical",
+          preventCollision: true,
           useCSSTransforms: true,
           transformScale: 1,
           isDroppable: true,
-          autoSize: true,
+          autoSize: false,
           verticalCompact: true,
           children: widgets.map((widget) => /* @__PURE__ */ jsx("div", { children: renderWidget(widget) }, widget.id))
         }
@@ -65667,7 +65682,7 @@ var DASHBOARD_TEMPLATES = [
         type: "activity",
         title: "Recent Activity",
         size: { w: 3, h: 6 },
-        position: { x: 9, y: 0 },
+        position: { x: 6, y: 0 },
         data: {
           realtime: true,
           items: [
@@ -65944,7 +65959,7 @@ var DashboardInternal = t__default.memo(function DashboardInternal2({
     const newWidgets = template.widgets.map((w, index2) => ({
       ...w,
       id: `widget-${Date.now()}-${index2}`,
-      position: w.position || { x: index2 * 3 % 12, y: Math.floor(index2 * 3 / 12) * 3 },
+      position: w.position || { x: index2 * 3 % 12, y: Math.floor(index2 / 4) * 3 },
       size: w.size || { w: 3, h: 3 }
     }));
     setWidgets(newWidgets);
@@ -73763,6 +73778,10 @@ function DataTable({
   const [columnVisibility, setColumnVisibility] = t__default.useState({});
   const [rowSelection, setRowSelection] = t__default.useState({});
   const [globalFilter, setGlobalFilter] = t__default.useState("");
+  const [paginationState, setPaginationState] = t__default.useState({
+    pageIndex: 0,
+    pageSize: defaultPageSize || pageSize || 10
+  });
   const [isPaginationLoading, setIsPaginationLoading] = t__default.useState(false);
   const [internalExpandedRows, setInternalExpandedRows] = t__default.useState(/* @__PURE__ */ new Set());
   const [filterDrawerOpen, setFilterDrawerOpen] = t__default.useState(false);
@@ -73792,6 +73811,7 @@ function DataTable({
     columns,
     onSortingChange: onSortingChange !== void 0 ? onSortingChange : setSorting,
     onColumnFiltersChange: onColumnFiltersChange !== void 0 ? onColumnFiltersChange : setColumnFilters,
+    onPaginationChange: onPaginationChange !== void 0 ? onPaginationChange : setPaginationState,
     getCoreRowModel: getCoreRowModel(),
     getPaginationRowModel: getPaginationRowModel(),
     getSortedRowModel: getSortedRowModel(),
@@ -73881,6 +73901,7 @@ function DataTable({
       columnVisibility: externalState?.columnVisibility ?? columnVisibility,
       rowSelection: externalState?.rowSelection ?? rowSelection,
       globalFilter: externalState?.globalFilter ?? globalFilter,
+      pagination: externalState?.pagination ?? paginationState,
       ...externalState || {}
     },
     initialState: {
@@ -74110,10 +74131,18 @@ function DataTable({
             {
               value: table.getState().pagination.pageSize,
               onChange: async (e) => {
-                setIsPaginationLoading(true);
-                await new Promise((resolve) => setTimeout(resolve, 300));
-                table.setPageSize(Number(e.target.value));
-                setIsPaginationLoading(false);
+                const newPageSize = Number(e.target.value);
+                if (onPaginationChange) {
+                  onPaginationChange({
+                    pageIndex: table.getState().pagination.pageIndex,
+                    pageSize: newPageSize
+                  });
+                } else {
+                  setIsPaginationLoading(true);
+                  await new Promise((resolve) => setTimeout(resolve, 300));
+                  table.setPageSize(newPageSize);
+                  setIsPaginationLoading(false);
+                }
               },
               className: "h-8 w-[70px] rounded border border-input bg-background px-3 py-1 text-sm",
               disabled: isPaginationLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@moontra/moonui-pro",
-    "version": "2.25.9",
+    "version": "2.25.11",
     "description": "Premium React components for MoonUI - Advanced UI library with 50+ pro components including performance, interactive, and gesture components",
     "type": "module",
     "main": "dist/index.mjs",